Jason Monk
9bb25af646
Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289
...
am: 523f522
* commit '523f5228d44cb0a5670fe085bb13ed4217e4e027':
Potential fix for receiver leak problem
Change-Id: If393c4b4d814aab5f1eb4e0b08c2e5ac1b88bba1
2016-04-20 14:02:16 +00:00
Jason Monk
304235ea7d
Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289
...
am: 3f53bdb
* commit '3f53bdb8a32f6da6c77ce4ceae7c4b19cf095ef2':
Potential fix for receiver leak problem
Change-Id: I462601739977f6c3d50d0460df4bb82daeeae865
2016-04-20 14:02:15 +00:00
Jason Monk
3f53bdb8a3
Merge "Potential fix for receiver leak problem" into nyc-dev
...
am: 623a289
* commit '623a289b9a6563afd4c54e1efdb505a5468731ea':
Potential fix for receiver leak problem
Change-Id: I7cffbfd8a425af397dab9fa4900aab613520c4b5
2016-04-20 13:59:42 +00:00
Jason Monk
523f5228d4
Merge "Potential fix for receiver leak problem" into nyc-dev
...
am: 623a289
* commit '623a289b9a6563afd4c54e1efdb505a5468731ea':
Potential fix for receiver leak problem
Change-Id: Id8f248da03867074561ce3c34cff80ffcb84ad93
2016-04-20 13:59:15 +00:00
Jason Monk
623a289b9a
Merge "Potential fix for receiver leak problem" into nyc-dev
2016-04-20 13:49:32 +00:00
Android Build Merger (Role)
b396a0897e
Merge "Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc
am: 6a782d9" into nyc-mr1-dev-plus-aosp
2016-04-20 13:34:13 +00:00
Clara Bayarri
d67f9a41fb
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc
...
am: 6a782d9
* commit '6a782d925f456209de47569fd7308e43a94a7f94':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I5840c18389d1dbcd6bb2a8121ddf4ad3302548fc
2016-04-20 13:34:03 +00:00
Clara Bayarri
83ff72cd44
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev am: 81c03dc
...
am: 38ee923
* commit '38ee923a5e97e87e5e1135ac3b8d588d90e0c446':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I519a294015346595bf20d35ab35fb5c5663e58d6
2016-04-20 13:34:02 +00:00
Clara Bayarri
38ee923a5e
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
...
am: 81c03dc
* commit '81c03dc32f723f1489c48640eb27fb40c0b47f0c':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I75dcdc1f242a99abdbeb96460dcbda5787f22b63
2016-04-20 13:30:46 +00:00
Clara Bayarri
6a782d925f
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
...
am: 81c03dc
* commit '81c03dc32f723f1489c48640eb27fb40c0b47f0c':
Fix Developer options appears after first boot, disappers on Settings Menu Reload
Change-Id: I336ea364687f696ea90c3261c843447175f00d26
2016-04-20 13:30:45 +00:00
Clara Bayarri
81c03dc32f
Merge "Fix Developer options appears after first boot, disappers on Settings Menu Reload" into nyc-dev
2016-04-20 13:24:43 +00:00
Clara Bayarri
cd6a2115c6
Fix Developer options appears after first boot, disappers on Settings Menu Reload
...
The Tiles are updated to disabled via PackageManager, which takes a few
seconds to kick in and hence the user sees the option appear and then
disappear. Making Developer Options disabled by default fixes the flash.
Note now the opposite happens, on eng builds where Developer Settings
are on by default they will not appear until the PackageManager update
has cleared.
Bug: 28121698
Change-Id: Ic7147e4430e2332d596ce37dbbce30e330dcf551
2016-04-20 11:51:52 +01:00
Sudheer Shanka
c779bece31
Apply policy transparency to "Stay awake" in Development settings.
...
Bug: 28271254
Change-Id: I203ce5c839e5f0201d287673ec3a48c8f835edc3
2016-04-19 22:49:45 -07:00
Sudheer Shanka
7e09747415
Fix summaries of some restricted switch preferences.
...
Bug: 27659072
Change-Id: I2cfb270ba77b0cfe3c81097b59779f70062b9b65
2016-04-19 21:46:31 -07:00
Android Build Merger (Role)
5fafee9819
Merge "Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7
am: 4362396184" into nyc-mr1-dev-plus-aosp
2016-04-20 00:14:19 +00:00
Daichi Hirono
f3d0b4af2f
Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7
...
am: 4362396184
* commit '4362396184d0da37ad5d955f37dead01f6df5455':
Add nullcheck to StorageSettings.
Change-Id: If0bac078c1d147c7d966fab8610e6a9fa629a0ae
2016-04-20 00:14:13 +00:00
Daichi Hirono
1a7aa2654f
Merge "Add nullcheck to StorageSettings." into nyc-dev am: 0e048a11c7
...
am: ef5285e3f6
* commit 'ef5285e3f6b83cbb32af1cda334a56477b7cdf3d':
Add nullcheck to StorageSettings.
Change-Id: Ib04ec248edcb5e46ac90c2cbb5c6662b7d5d3b47
2016-04-20 00:14:11 +00:00
Daichi Hirono
ef5285e3f6
Merge "Add nullcheck to StorageSettings." into nyc-dev
...
am: 0e048a11c7
* commit '0e048a11c7a9567cf77fbef481a564833359369f':
Add nullcheck to StorageSettings.
Change-Id: I58982903534d2dce24bd453bc72617a607373684
2016-04-20 00:12:03 +00:00
Daichi Hirono
4362396184
Merge "Add nullcheck to StorageSettings." into nyc-dev
...
am: 0e048a11c7
* commit '0e048a11c7a9567cf77fbef481a564833359369f':
Add nullcheck to StorageSettings.
Change-Id: I749ecbe1ae8ce687ae9feca98a75539405b0a579
2016-04-20 00:12:03 +00:00
Daichi Hirono
0e048a11c7
Merge "Add nullcheck to StorageSettings." into nyc-dev
2016-04-20 00:04:11 +00:00
yifan.bai
198b92d037
resolve merge conflicts of 5213f71
to nyc-dev-plus-aosp
...
am: d2477357e8
* commit 'd2477357e86f453b8aef9e4255edf55625c5cd3d':
Fix APN cannot save after ApnEditor is paused.
Change-Id: Ieb25454381616d68458e8416ffe933b77dcec9fd
2016-04-19 23:26:31 +00:00
Amit Mahajan
d2477357e8
resolve merge conflicts of 5213f71
to nyc-dev-plus-aosp
...
Change-Id: I6cf4ec06ee296fa13b51e36379a9bc77edaac1bc
2016-04-19 16:15:56 -07:00
yifan.bai
5213f71536
Merge "Fix APN cannot save after ApnEditor is paused."
...
am: 052768a8b5
* commit '052768a8b57cc5dc8ec8ea7bebccbc3f0b1e9c09':
Fix APN cannot save after ApnEditor is paused.
Change-Id: I2f7ac81f9955ca02ab8b37084bed68934a11f9e9
2016-04-19 23:06:49 +00:00
Andrew Sapperstein
13792886a7
Create feature factory interface & initial impl.
...
Creates the abstract class FeatureFactory and an AOSP implementation
called Factory.
Also creates a static library for generating logtags since we need to use the code generated
by the logtags in multiple packages now.
BUG: 27751878
Change-Id: I88d826333642d3efc252134c4facb7b1ca014f32
(cherry picked from commit 867bb9c07a
)
2016-04-19 23:01:49 +00:00
Amit Mahajan
052768a8b5
Merge "Fix APN cannot save after ApnEditor is paused."
2016-04-19 22:58:18 +00:00
Maurice Lam
fd03c3b366
[Fingerprint] Update strings
...
Update the label for the options in setup to match the flow model of
setup wizard.
Bug: 28219260
Change-Id: Ia975b5fc95c7c82c5ec23a2af5dcdcd9d69bb594
2016-04-19 14:24:17 -07:00
Udam Saini
29a04c05a5
Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511
...
am: 2620e24
* commit '2620e248f37da0135bbbb37294aba48a5c426f38':
Change-Id: I9fd5132af3b89cda76005e6cb85dc7ebdd49d10e
2016-04-19 20:57:38 +00:00
Udam Saini
a1acb6a9f8
Merge "Fix back button on fragments without help uris" into nyc-dev am: ed74511
...
am: 3d2cba5
* commit '3d2cba56632ad05427dc058b8097c18ed954296e':
Fix back button on fragments without help uris
Change-Id: I0141b385ff13002c9975b6d050753cec0ca87ff5
2016-04-19 20:54:14 +00:00
Johan Redestig
3d2cba5663
Merge "Fix back button on fragments without help uris" into nyc-dev
...
am: ed74511
* commit 'ed74511cb170f499e3c776208471b9ff3fbc762b':
Fix back button on fragments without help uris
Change-Id: Iea98f27e3784bb34fd4a272f2c450a5704e6555d
2016-04-19 20:51:10 +00:00
Johan Redestig
2620e248f3
Merge "Fix back button on fragments without help uris" into nyc-dev
...
am: ed74511
* commit 'ed74511cb170f499e3c776208471b9ff3fbc762b':
Fix back button on fragments without help uris
Change-Id: I327abac867272c5900603d71d6e7ed4370dc0c48
2016-04-19 20:50:48 +00:00
Udam Saini
ed74511cb1
Merge "Fix back button on fragments without help uris" into nyc-dev
2016-04-19 20:39:29 +00:00
TreeHugger Robot
63e39411ea
Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d
...
am: 9a22ccd
* commit '9a22ccde2f0fe216e59ebf512e2846ff26f0b753':
Change-Id: Iffe9ac9c0e0307bb86f5920c8b1df465ccf70bbe
2016-04-19 19:01:39 +00:00
TreeHugger Robot
51ea751ff5
Merge "Fixed AccessPreference listener." into nyc-dev am: 40c228d
...
am: c838707
* commit 'c8387072eefd1871b34ac373f986c441b909b5bd':
Fixed AccessPreference listener.
Change-Id: I00f43d6145d7de3cc5ee73a3a231f49dd951d922
2016-04-19 18:59:31 +00:00
Felipe Leme
9a22ccde2f
Merge "Fixed AccessPreference listener." into nyc-dev
...
am: 40c228d
* commit '40c228d989c19eb69f5efe258cf7d24cf86e93ba':
Fixed AccessPreference listener.
Change-Id: I7f47a8a2ce57e3cb17aef915b9430c1be5b0da15
2016-04-19 18:59:26 +00:00
Victor Chang
dc1f7d7584
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7
...
am: 063ae24
* commit '063ae24903e47e6a4c1192d480e1dffa33be39c0':
Change-Id: I836a949927d865feedc1cc6076357c2d6b84eb76
2016-04-19 18:46:26 +00:00
Felipe Leme
c8387072ee
Merge "Fixed AccessPreference listener." into nyc-dev
...
am: 40c228d
* commit '40c228d989c19eb69f5efe258cf7d24cf86e93ba':
Fixed AccessPreference listener.
Change-Id: Idca40034b476faf3be1a83a3e8cb224b8c3c8680
2016-04-19 18:45:51 +00:00
Victor Chang
ad8d93ce4f
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev am: 04a01b7
...
am: f766cc8
* commit 'f766cc83951fff0c26ca57b074693ef8a4775283':
Remove reference to @string/ssl_ca_cert_dialog_title
Change-Id: Iadbd090b2a15b91137e170b7a22827d7fb3293e0
2016-04-19 18:42:48 +00:00
TreeHugger Robot
40c228d989
Merge "Fixed AccessPreference listener." into nyc-dev
2016-04-19 18:41:06 +00:00
Victor Chang
063ae24903
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
...
am: 04a01b7
* commit '04a01b7cc79e14e062f8b50d84f3ee3b8251233e':
Remove reference to @string/ssl_ca_cert_dialog_title
Change-Id: I4d4677536be0f30e0c46cd191fa6f9eea518960b
2016-04-19 18:39:19 +00:00
Victor Chang
f766cc8395
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
...
am: 04a01b7
* commit '04a01b7cc79e14e062f8b50d84f3ee3b8251233e':
Remove reference to @string/ssl_ca_cert_dialog_title
Change-Id: I83917e8e6ecf29456a4559b3540e64540ddde144
2016-04-19 18:39:11 +00:00
Jason Monk
3bd5600360
Merge "Fix account screen in split screen" into nyc-dev am: 43059b7
...
am: 7e62eef
* commit '7e62eef4eff6b25f146cacd584355678f11f8b99':
Change-Id: Ibd3440f753cab510c7db9b506b4fbc5e43828e67
2016-04-19 18:31:38 +00:00
Jason Monk
50d03f4f65
Merge "Fix account screen in split screen" into nyc-dev am: 43059b7
...
am: 4619c9c
* commit '4619c9cf4a37a510d646321eba670c831ee5f703':
Fix account screen in split screen
Change-Id: I34a6c6f43a511212c851ace8e551e23c6d640832
2016-04-19 18:29:40 +00:00
Victor Chang
04a01b7cc7
Merge "Remove reference to @string/ssl_ca_cert_dialog_title" into nyc-dev
2016-04-19 18:29:16 +00:00
Jason Monk
4619c9cf4a
Merge "Fix account screen in split screen" into nyc-dev
...
am: 43059b7
* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
Fix account screen in split screen
Change-Id: Ic0bf62fedbeca0800fd807ee7c5839fa564fbd42
2016-04-19 18:22:29 +00:00
Jason Monk
7e62eef4ef
Merge "Fix account screen in split screen" into nyc-dev
...
am: 43059b7
* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
Fix account screen in split screen
Change-Id: I7e422356106307ef827f04a2147a7978bd6d81d6
2016-04-19 18:22:21 +00:00
Noah Wang
ff380b9841
Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6
...
am: 9359e0f
* commit '9359e0f9691664df3ac9d74759ad4e90c38266e3':
Change-Id: Ie294eb37d3ef9e6d420b41f501d28c45f02e4bab
2016-04-19 18:14:24 +00:00
Noah Wang
0b420fdad1
Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev am: 4f63bb6
...
am: 1c94e6d
* commit '1c94e6dd90288d16a1ea2b2d132f5b7e4c2f7ddc':
Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996
Change-Id: If80159aeef6a321f7c278700db217b6491a9a3d4
2016-04-19 18:11:09 +00:00
Jason Monk
43059b7e7c
Merge "Fix account screen in split screen" into nyc-dev
2016-04-19 18:09:27 +00:00
Noah Wang
1c94e6dd90
Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev
...
am: 4f63bb6
* commit '4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996
Change-Id: Ie9845c3f043d9fcb0733fe7204696b5792d8e9d9
2016-04-19 18:07:20 +00:00
Noah Wang
9359e0f969
Merge "Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996" into nyc-dev
...
am: 4f63bb6
* commit '4f63bb69f5f63a19e0fdf03b1c240bd6d12d0ce1':
Fix preview screen crashing and glitches for Display / Font size Bug: 28223545 Bug: 28223533 Bug: 28210654 Bug: 28210242 Bug: 28208955 Bug: 27699996
Change-Id: I0ed40edbd65890426f07e38a36369592b29ddb01
2016-04-19 18:07:08 +00:00