Bryce Lee
0ad58deca1
am 5f11a1af: add correct exception throw declaration to isScreenBrightnessBoosted.
...
* commit '5f11a1af572730567d9e35d6792a720585a268c6':
add correct exception throw declaration to isScreenBrightnessBoosted.
2015-03-25 20:33:53 +00:00
Alan Viverette
a0d3d003c8
am 5fc9b336: Merge "Consider RTL layout in DPAD navigation in Gallery"
...
* commit '5fc9b336ebb6fc224b3e77af388024dea029fbb3':
Consider RTL layout in DPAD navigation in Gallery
2015-03-25 20:18:37 +00:00
Chad Brubaker
5a01999e7b
am 704aa5ae: Merge "Use correct tag type for RSA exponent"
...
* commit '704aa5ae48b5c0ff3e330aba9611723840396fdb':
Use correct tag type for RSA exponent
2015-03-25 20:12:55 +00:00
Chad Brubaker
ee468ea881
am 6326f964: Merge "Make application/client id an object"
...
* commit '6326f964769c603382ee6694b33954b4ff9b9a52':
Make application/client id an object
2015-03-25 20:12:49 +00:00
Alan Viverette
5fc9b336eb
Merge "Consider RTL layout in DPAD navigation in Gallery"
2015-03-25 20:04:22 +00:00
Chad Brubaker
704aa5ae48
Merge "Use correct tag type for RSA exponent"
2015-03-25 19:35:01 +00:00
Chad Brubaker
6326f96476
Merge "Make application/client id an object"
2015-03-25 19:25:55 +00:00
Alex Klyubin
6a7ac540e1
am a9f62866: Merge "Framework\'s NetworkSecurityPolicy delegates to libcore\'s one."
...
* commit 'a9f628662c348c5926caf5e2df0fd2f245a715bf':
Framework's NetworkSecurityPolicy delegates to libcore's one.
2015-03-25 19:03:34 +00:00
Chad Brubaker
9db6e4d7a3
am 5aeb0853: Merge "Enforce tag types in KeymasterArgument classes"
...
* commit '5aeb085389954a32e1ea2189b7bec8080b0226c5':
Enforce tag types in KeymasterArgument classes
2015-03-25 19:03:28 +00:00
Alan Viverette
ddb30cd36f
am 7506f499: Merge "Fix to crash when clicking text link without view activity"
...
* commit '7506f499b523d05c6bca5acb6d83f55820d33771':
Fix to crash when clicking text link without view activity
2015-03-25 19:03:21 +00:00
Bryce Lee
5f11a1af57
add correct exception throw declaration to isScreenBrightnessBoosted.
...
Change-Id: I9b861002d7719ad43643d68f6795df6938bd0fc3
2015-03-25 11:51:39 -07:00
Bryce Lee
a6045ec8ed
am 40a4f4a6: Implement isScreenBrightnessBoosted in BridgePowerManager.
...
* commit '40a4f4a61fbb2172901eda763bf928ae9b1b5300':
Implement isScreenBrightnessBoosted in BridgePowerManager.
2015-03-25 18:51:05 +00:00
Bryce Lee
40a4f4a61f
Implement isScreenBrightnessBoosted in BridgePowerManager.
...
Change-Id: I7da132c7522e5c352e14123f059b900008d94c95
2015-03-25 11:16:23 -07:00
Alex Klyubin
a9f628662c
Merge "Framework's NetworkSecurityPolicy delegates to libcore's one."
2015-03-25 18:13:18 +00:00
Chad Brubaker
5aeb085389
Merge "Enforce tag types in KeymasterArgument classes"
2015-03-25 18:00:48 +00:00
Alan Viverette
7506f499b5
Merge "Fix to crash when clicking text link without view activity"
2015-03-25 16:35:37 +00:00
Chris Craik
e3abfef62b
am 82f6b16e: Merge "hwui : fix memory leak due to duplicate in shadow cache"
...
* commit '82f6b16e10a116a42e32c99c34fb2d435da21fd5':
hwui : fix memory leak due to duplicate in shadow cache
2015-03-25 16:28:58 +00:00
Alex Klyubin
d4a2e7c404
am ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy."
...
* commit 'ff022cb1bd70fc4c9f973af5afebf51517bda572':
Address pending comments for NetworkSecurityPolicy.
2015-03-25 16:18:50 +00:00
Chris Craik
82f6b16e10
Merge "hwui : fix memory leak due to duplicate in shadow cache"
2015-03-25 16:15:12 +00:00
Bryce Lee
21b7e6de94
am c831b978: Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
...
* commit 'c831b978238d5ed200ca329c540eff00faba77e3':
Add isScreenBrightnessBoosted and a broadcast when underlying value changes.
2015-03-25 16:09:48 +00:00
Bryce Lee
c831b97823
Merge "Add isScreenBrightnessBoosted and a broadcast when underlying value changes." into lmp-mr1-modular-dev
2015-03-25 16:06:17 +00:00
Alex Klyubin
403a494d56
Framework's NetworkSecurityPolicy delegates to libcore's one.
...
Now that the libcore's NetworkSecurityPolicy abstraction is in place,
the framework version of the abstraction should delegate to the
libcore one, to avoid them getting out of sync.
Bug: 19215516
Change-Id: Ic57341d703a13e0fb100dc414958e8fd54e03816
2015-03-25 09:00:37 -07:00
Geoff Mendal
d86a584f10
am 9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
...
* commit '9cfd002e06c32789ae57698a2d5ca565d7128a49':
Import translations. DO NOT MERGE
2015-03-25 15:45:39 +00:00
Alex Klyubin
ff022cb1bd
Merge "Address pending comments for NetworkSecurityPolicy."
2015-03-25 15:34:36 +00:00
Geoff Mendal
9cfd002e06
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
2015-03-25 15:33:48 +00:00
Geoff Mendal
f205d3070f
Import translations. DO NOT MERGE
...
Change-Id: I2577a86f9122987bb941278a290022da1ea61f9d
Auto-generated-cl: translation import
2015-03-25 07:33:12 -07:00
Jason Monk
4c1a49fc53
am 039013c2: Merge "Sort Bluetooth devices in quick settings by name"
...
* commit '039013c28ef634ab1b630292cc38fb57f206dffd':
Sort Bluetooth devices in quick settings by name
2015-03-25 14:25:10 +00:00
Jason Monk
039013c28e
Merge "Sort Bluetooth devices in quick settings by name"
2015-03-25 14:12:13 +00:00
Gus Prevas
c4d7fc1021
am 568356ff: Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev
...
* commit '568356ff9a1deab794d329f8c2e245f5a564a2f3':
Changes callback to a WeakReference in ActivityContainerCallback.
2015-03-25 13:02:46 +00:00
Gus Prevas
568356ff9a
Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev
2015-03-25 12:55:37 +00:00
Paul Crowley
a23995c233
Fix NPE if FPE service does not exist.
...
Bug: 19846662
Change-Id: I44e014c66a524b282cce0cfc9b7513fc0f553576
2015-03-25 11:43:42 +00:00
Deepanshu Gupta
693236b367
am c263a07a: am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
...
* commit 'c263a07a55a9806147304a1420ceec2d27a6b49d':
Update JRE for runConfigurations.
2015-03-25 00:15:44 +00:00
Deepanshu Gupta
83ba89e94a
am 3deade59: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
...
* commit '3deade5981372fc44e83c161c7d0dbb9df529e3f':
Fix project settings. [DO NOT MERGE]
2015-03-25 00:15:39 +00:00
Deepanshu Gupta
ce2b74f729
am e51f5cdc: am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
...
* commit 'e51f5cdcf34fe127792a177a3953dad03ef23647':
Fix RoundRect radius.
2015-03-25 00:15:33 +00:00
Deepanshu Gupta
5c03cd8aad
am 96a67430: am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
...
* commit '96a67430c0088168f21b230c64c348a53e672538':
Use right colors for status bar and nav bar.
2015-03-25 00:15:28 +00:00
Deepanshu Gupta
25557e0a96
am 5f0252de: am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
...
* commit '5f0252dee43a1cd0f1591b3c9bea2d47ad1f3df0':
Better shadows.
2015-03-25 00:15:22 +00:00
Deepanshu Gupta
01f9ad1c67
am 2ceb310d: am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
...
* commit '2ceb310d09a865c56145ba8b5d643a11a7ad2ce5':
Fix layoutlib tests.
2015-03-25 00:15:14 +00:00
Deepanshu Gupta
c263a07a55
am 862f5900: am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
...
* commit '862f5900e8abce1cc20979a4dca76e1f0b982880':
Update JRE for runConfigurations.
2015-03-25 00:09:01 +00:00
Deepanshu Gupta
3deade5981
am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
...
* commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad':
Fix project settings. [DO NOT MERGE]
2015-03-25 00:08:54 +00:00
Deepanshu Gupta
e51f5cdcf3
am e97079d9: am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
...
* commit 'e97079d97a5c914d06c24cb9deda1da9bea88aeb':
Fix RoundRect radius.
2015-03-25 00:08:47 +00:00
Deepanshu Gupta
96a67430c0
am 2b98abde: am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
...
* commit '2b98abde26aa2033562b48d635d6f2ba11c48908':
Use right colors for status bar and nav bar.
2015-03-25 00:08:41 +00:00
Deepanshu Gupta
5f0252dee4
am 6fa9d554: am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
...
* commit '6fa9d5546fa27665de3f64564897a77735b2a1b0':
Better shadows.
2015-03-25 00:08:35 +00:00
Deepanshu Gupta
2ceb310d09
am 5bc625d8: am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
...
* commit '5bc625d83d60fbb27ab2297051971be91fb3e415':
Fix layoutlib tests.
2015-03-25 00:08:28 +00:00
Deepanshu Gupta
862f5900e8
am 44b5a1c8: am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
...
* commit '44b5a1c8471ef5e1cd3dcfffec5a9e439f228766':
Update JRE for runConfigurations.
2015-03-25 00:02:18 +00:00
Deepanshu Gupta
dbb38b3061
am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
...
* commit 'cbb4ec78675c8179cdedafba1972ac062844c70a':
Fix project settings. [DO NOT MERGE]
2015-03-25 00:02:06 +00:00
Deepanshu Gupta
e97079d97a
am a16bb347: am 44fea603: Merge "Fix RoundRect radius." into lmp-dev
...
* commit 'a16bb347e120ba17e87f33ff0364380211d01baf':
Fix RoundRect radius.
2015-03-25 00:01:58 +00:00
Deepanshu Gupta
2b98abde26
am 8f9ebc65: am 3bd5cbb1: Merge "Use right colors for status bar and nav bar." into lmp-dev
...
* commit '8f9ebc65939ed3ac2e7fdc135e8513fd8d65daaf':
Use right colors for status bar and nav bar.
2015-03-25 00:01:53 +00:00
Deepanshu Gupta
6fa9d5546f
am 0b76cf6f: am 34751c79: Merge "Better shadows." into lmp-dev
...
* commit '0b76cf6ff56c59a04783714d40163576e3081cf1':
Better shadows.
2015-03-25 00:01:49 +00:00
Deepanshu Gupta
5bc625d83d
am a62a18e3: am 311a0f54: Merge "Fix layoutlib tests." into lmp-dev
...
* commit 'a62a18e341180ccf6f5379a7d753584f6cee2e7c':
Fix layoutlib tests.
2015-03-25 00:01:43 +00:00
Deepanshu Gupta
44b5a1c847
am e541f350: Merge "Update JRE for runConfigurations." into lmp-dev
...
* commit 'e541f35055709ec43407649b8517639ff00e42d6':
Update JRE for runConfigurations.
2015-03-24 23:55:18 +00:00