OSDN Git Service
Philip P. Moltmann [Mon, 16 Apr 2018 19:08:05 +0000 (12:08 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf am:
d139755de8 am:
5e2a5a8ce1 -s ours
am:
a8b12c4994
Change-Id: I2315205ef2681f5384a12e84a8274fe49d910709
hughchen [Mon, 16 Apr 2018 18:55:54 +0000 (11:55 -0700)]
Merge "Add new function to get audio state" into pi-dev
am:
e504e1322e
Change-Id: I776ef38002527e9a3db49896b86fe377fce01e8f
Philip P. Moltmann [Mon, 16 Apr 2018 18:55:42 +0000 (11:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf am:
d139755de8
am:
5e2a5a8ce1 -s ours
Change-Id: I665c1f65a60926a70627db83da5c2c6f3e4f09c8
Ricky Wai [Mon, 16 Apr 2018 18:50:44 +0000 (11:50 -0700)]
Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev
am:
ed2a3cadc1
Change-Id: Icb8d0962ddbe4ba4c25b835cc631cedd94c818eb
TreeHugger Robot [Mon, 16 Apr 2018 18:34:37 +0000 (18:34 +0000)]
Merge "Add new function to get audio state" into pi-dev
Andreas Gampe [Mon, 16 Apr 2018 18:21:20 +0000 (11:21 -0700)]
Merge "Revert "Frameworks/base: Compiled-classes support"" am:
087bae3ffe
am:
f6786aeb64
Change-Id: I52f22c3df2a0a8d99d7be0d68fbf11eec2de8024
Ricky Wai [Mon, 16 Apr 2018 18:19:00 +0000 (18:19 +0000)]
Merge "Update PackageManager.getInstalledPackages() docs" into pi-dev
Andreas Gampe [Mon, 16 Apr 2018 18:10:20 +0000 (11:10 -0700)]
Merge "Revert "Frameworks/base: Compiled-classes support""
am:
087bae3ffe
Change-Id: I32cba3d29b54827ee3d40ea022a1d9eae27cfb0f
Beverly [Mon, 16 Apr 2018 18:03:54 +0000 (11:03 -0700)]
Merge "Add logging to ScheduleConditionProvider" into pi-dev
am:
8f308fd4e3
Change-Id: I39a7d1316454c6a0050d736324d949846fdf940d
Bryce Lee [Mon, 16 Apr 2018 17:54:57 +0000 (10:54 -0700)]
Merge "Remove temporary logging." into pi-dev
am:
216b50ad97
Change-Id: I49b008a4173e0c3fee6a3e3202f5b18c1c991fc9
TreeHugger Robot [Mon, 16 Apr 2018 17:38:34 +0000 (17:38 +0000)]
Merge "Add logging to ScheduleConditionProvider" into pi-dev
Bryce Lee [Mon, 16 Apr 2018 17:36:45 +0000 (17:36 +0000)]
Merge "Remove temporary logging." into pi-dev
Ryan Mitchell [Mon, 16 Apr 2018 17:32:42 +0000 (10:32 -0700)]
Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev
am:
356feb53b6
Change-Id: Ib8b9fbea279f61b5df9058d9f72dfb23f9d9dbc6
Derek Sollenberger [Mon, 16 Apr 2018 17:27:40 +0000 (10:27 -0700)]
Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev
am:
1c70ecb455
Change-Id: Ia10cec1f06051620b39869265ad386a63b5434e9
Isha Bobra [Mon, 16 Apr 2018 17:22:50 +0000 (10:22 -0700)]
The file CachedBluetoothDeviceManager.java performs synchronization at class level. This CL just adds the missing synchronization bits.
am:
d467da7309
Change-Id: I0c2d1b207276aad17e369eefdf041a046a08a68a
Jeff Sharkey [Mon, 16 Apr 2018 17:19:39 +0000 (10:19 -0700)]
Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
am:
f78b8ce258
Change-Id: Ie9bcdc9736c04ab787efc193311a20d03718b593
Ryan Mitchell [Mon, 16 Apr 2018 17:15:53 +0000 (17:15 +0000)]
Merge "AAPT: Modified StringPool uniqueness detection" into pi-dev
Chavi Weingarten [Mon, 16 Apr 2018 17:13:31 +0000 (10:13 -0700)]
Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev
am:
2754777d30
Change-Id: Ic662d242231c5e8c375805930e59d55da0a15b01
Jeff Sharkey [Mon, 16 Apr 2018 17:07:52 +0000 (10:07 -0700)]
Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev
am:
e0fe6df357
Change-Id: I2cc76316bca81c12e56337d6e36d82b0de6d9ded
TreeHugger Robot [Mon, 16 Apr 2018 17:05:45 +0000 (17:05 +0000)]
Merge "Unpin bitmaps but don't purge all scratch resources." into pi-dev
Isha Bobra [Thu, 5 Apr 2018 20:27:47 +0000 (13:27 -0700)]
The file CachedBluetoothDeviceManager.java performs synchronization
at class level. This CL just adds the missing synchronization bits.
Test: Manual
Change-Id: I71e0a194f8d126c2898a4086d6bcb62156cab9ad
Bug:
77849851
Isha Bobra [Mon, 16 Apr 2018 16:55:47 +0000 (09:55 -0700)]
Merge "Show only 1 entry for hearing aid device after killing the activity." into pi-dev
am:
ed344d1753
Change-Id: I9f9df695df7555ea67cf4ca371528b9246d70dff
Jeff Sharkey [Mon, 16 Apr 2018 16:54:32 +0000 (16:54 +0000)]
Merge "Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:50:48 +0000 (16:50 +0000)]
Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 16:50:34 +0000 (16:50 +0000)]
Revert "Revert "OP_GET_USAGE_STATS should be noted, not checked.""
This reverts commit
bd2a9a2915c17cbe2100d6d2077568d0936cd719.
Reason for revert: ijpedowitz@
Bug:
77662908
Change-Id: I596d330d64942105f447bb613012bb11e281a805
Exempt-From-Owner-Approval: keep tests passing
Jeff Sharkey [Mon, 16 Apr 2018 16:50:06 +0000 (16:50 +0000)]
Merge "Revert "OP_GET_USAGE_STATS should be noted, not checked."" into pi-dev
Isha Bobra [Mon, 16 Apr 2018 16:42:33 +0000 (16:42 +0000)]
Merge "Show only 1 entry for hearing aid device after killing the activity." into pi-dev
Jeff Sharkey [Mon, 16 Apr 2018 16:39:55 +0000 (16:39 +0000)]
Revert "OP_GET_USAGE_STATS should be noted, not checked."
This reverts commit
5a8bcd90315c24e2f16176fd13922b2a92752cd5.
Reason for revert: ijpedowitz@
Bug:
77662908
Change-Id: I5dd0ad5038df90ea8a80ba6f583ee46fb24600c2
Exempt-From-Owner-Approval: keep tests passing
Treehugger Robot [Mon, 16 Apr 2018 16:33:24 +0000 (16:33 +0000)]
Merge "Revert "Frameworks/base: Compiled-classes support""
Michael Wright [Mon, 16 Apr 2018 16:29:39 +0000 (09:29 -0700)]
Merge "Convert the BrightnessController to a log scale control." into pi-dev
am:
56a5620b41
Change-Id: I440109410c4cac5ebd175e05e9f12bad0de09ed4
Bill Yi [Mon, 16 Apr 2018 16:24:28 +0000 (09:24 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
1bf77e9021 -s ours
Change-Id: Iaaa5c19a3da66e504d89a1af6d700b297a301751
TreeHugger Robot [Mon, 16 Apr 2018 16:18:34 +0000 (16:18 +0000)]
Merge "Convert the BrightnessController to a log scale control." into pi-dev
Adrian Roos [Mon, 16 Apr 2018 16:16:56 +0000 (09:16 -0700)]
Merge changes I478047cc,Ibe16ffd7 into pi-dev
am:
892ee93977
Change-Id: Id60ec23a210c907bf61a4f0c95441e5f48b773cc
Makoto Onuki [Mon, 16 Apr 2018 16:08:35 +0000 (09:08 -0700)]
Merge "Skip cross-user/profile check for start activity pending intents." into pi-dev
am:
8f9fce0680
Change-Id: Ifb0325feb6c9a73a50c8ffe0f6e2b774966fa6fb
TreeHugger Robot [Mon, 16 Apr 2018 16:08:18 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 16:07:27 +0000 (16:07 +0000)]
Merge changes I478047cc,Ibe16ffd7 into pi-dev
* changes:
DisplayCutout: Ensure stable insets cover top cutout
Cutout: Use stable density for inflating simulated cutouts
Makoto Onuki [Mon, 16 Apr 2018 15:55:36 +0000 (15:55 +0000)]
Merge "Skip cross-user/profile check for start activity pending intents." into pi-dev
Makoto Onuki [Mon, 16 Apr 2018 15:51:04 +0000 (08:51 -0700)]
Merge "Fix "auto battery saver notification comes back"" into pi-dev
am:
167032ab00
Change-Id: I2f1d971f2ca72fe5b4571027182235caf15f6575
Beverly [Mon, 16 Apr 2018 15:42:40 +0000 (11:42 -0400)]
Add logging to ScheduleConditionProvider
Test: n/a
Bug:
77906756
Change-Id: Icfc0cbaf6d53315e437ac3ea3ab693b3e0703d2f
Chavi Weingarten [Mon, 16 Apr 2018 15:34:45 +0000 (15:34 +0000)]
Revert "ViewRoot: Ensure we release surface from setWindowStopped."
This reverts commit
35274cb0ce90ce4381e534d1c04c9d919eb588fc.
Reason for revert: b/
78110749
Fixes:
78110749
Change-Id: Ib1b15e4f7325cb265574090b658514fc0b3c4021
Adrian Roos [Mon, 16 Apr 2018 15:32:42 +0000 (08:32 -0700)]
Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
am:
26c25f0033
Change-Id: I2e256085c93e9c5968477f715f4d0929e0e74f8f
Makoto Onuki [Mon, 16 Apr 2018 15:32:20 +0000 (15:32 +0000)]
Merge "Fix "auto battery saver notification comes back"" into pi-dev
David Brazdil [Mon, 16 Apr 2018 15:24:40 +0000 (08:24 -0700)]
Merge "Add more hidden API on light greylist" into pi-dev
am:
8ef1cb9d10
Change-Id: Ibe5037b353b01f7eb523a5a44112e429b230dff2
TreeHugger Robot [Mon, 16 Apr 2018 15:20:04 +0000 (15:20 +0000)]
Merge "Cutout: Fix broken cutout rendering in landscape" into pi-dev
Dan Gittik [Mon, 16 Apr 2018 15:05:23 +0000 (08:05 -0700)]
Merge "Added screen brightness override feedback." into pi-dev
am:
6ddaed5efd
Change-Id: Id73dbb9fc8286865d0bb78949f8abb585defa483
David Brazdil [Mon, 16 Apr 2018 15:04:07 +0000 (15:04 +0000)]
Merge "Add more hidden API on light greylist" into pi-dev
Benjamin Miller [Mon, 16 Apr 2018 15:01:15 +0000 (08:01 -0700)]
Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev
am:
bdf8f1e3a2
Change-Id: I78270fc1f639f87c3a26ab97ec526c902ff081c7
Adrian Roos [Mon, 16 Apr 2018 14:56:07 +0000 (16:56 +0200)]
DisplayCutout: Ensure stable insets cover top cutout
Fixes an issue where the stable insets could become smaller
than the top cutout if the display density was set lower
than the natural density.
Bug:
78110564
Test: Set display size to "small", turn on cutout, verify apps do not have a gap between status bar and content.
Change-Id: I478047ccaade0e4e265cc57d03b072ae578b49d0
TreeHugger Robot [Mon, 16 Apr 2018 14:48:38 +0000 (14:48 +0000)]
Merge "Added screen brightness override feedback." into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:48:19 +0000 (14:48 +0000)]
Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev
Bill Yi [Mon, 16 Apr 2018 14:34:28 +0000 (07:34 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
3c074aacc2 -s ours
Change-Id: Ibc2f88f11d3ae8add29a60af099efc6818125662
Bill Yi [Mon, 16 Apr 2018 14:32:24 +0000 (07:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
1caec875ab -s ours
Change-Id: Ic6152a928385bfc4c32bc41aa2542266d58eb0ec
TreeHugger Robot [Mon, 16 Apr 2018 14:26:28 +0000 (14:26 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Mon, 16 Apr 2018 14:22:12 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Adrian Roos [Mon, 16 Apr 2018 14:12:40 +0000 (16:12 +0200)]
Cutout: Use stable density for inflating simulated cutouts
Change-Id: Ibe16ffd792040e753d54d7085ba74e8880de111e
Fixes:
77961334
Test: Set density to Very large, enable simulated cutout, verify it still looks reasonable.
Adrian Roos [Mon, 16 Apr 2018 14:03:04 +0000 (16:03 +0200)]
Cutout: Fix broken cutout rendering in landscape
Change-Id: I835fd7fa06dfcc0eff0323efe8f2913b9e1239b8
Fixes:
77960411
Test: Simulate cutout, rotate to landscape, verify cutout is still visible.
Michael Wright [Fri, 13 Apr 2018 17:15:27 +0000 (18:15 +0100)]
Convert the BrightnessController to a log scale control.
Currently, the BrightnessController's UI is a linear scale control on
top of a linear backlight control, but humans perceive brightness on a
roughly logarithmic scale. By moving to a non-linear control, we both
give users more fine-grained control over the brightness of the display
as well as a UI that works more intuitively.
Test: manual
Bug:
73810208
Change-Id: I67090ad7c4ced0420314458473c9124cb9c61906
Benjamin Miller [Mon, 16 Apr 2018 12:54:43 +0000 (12:54 +0000)]
Doc change: removed reference to the reverted Password Blacklist feature.
Bug:
73750934
Test: make ds-docs and inspected HTML output.
Change-Id: I545ef13219dc994a4f157cc6f2380eac59331498
Lucas Dupin [Mon, 16 Apr 2018 11:42:34 +0000 (04:42 -0700)]
Merge "Bouncer visibility fixes" into pi-dev
am:
606440f142
Change-Id: I14ed1a28b0ac56bcdd258cc528f7be30ae2badd8
TreeHugger Robot [Mon, 16 Apr 2018 11:30:37 +0000 (11:30 +0000)]
Merge "Bouncer visibility fixes" into pi-dev
David Brazdil [Mon, 16 Apr 2018 11:05:41 +0000 (12:05 +0100)]
Add more hidden API on light greylist
Bug:
64382372
Bug:
78019806
Bug:
77982395
Bug:
77862070
Bug:
77860747
Bug:
77785209
Bug:
77814672
Bug:
77760092
Test: make
Change-Id: I78643c355801241a2e02f16f986a7a5d14d79823
Lucas Dupin [Mon, 16 Apr 2018 06:50:20 +0000 (14:50 +0800)]
Bouncer visibility fixes
Test: go/sysui-bouncer-tests
Change-Id: Iaf6e0ded57eb3b737cfd074bbc750aa6977e36b2
Fixes:
77921840
Bill Yi [Mon, 16 Apr 2018 08:19:56 +0000 (01:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I458b91bd87cd73ec887a9581ed1d4d2527513bd4
Bernie Innocenti [Mon, 16 Apr 2018 07:23:28 +0000 (00:23 -0700)]
Merge "Teach ApfGenerator about the new opcodes for accessing data memory" am:
5a533ae460
am:
faf23c9281
Change-Id: Ia6fafc71380a2d05cd3d3ea019e69b8109269da1
Bernie Innocenti [Mon, 16 Apr 2018 07:12:04 +0000 (00:12 -0700)]
Merge "Teach ApfGenerator about the new opcodes for accessing data memory"
am:
5a533ae460
Change-Id: I904d482c71aa8e1b8859d2d27643592cff49ffb9
Chalard Jean [Mon, 16 Apr 2018 05:48:50 +0000 (22:48 -0700)]
Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev
am:
a7579d6325
Change-Id: Iba59e93875c28b8e30db0c013575bc2f117cb16c
TreeHugger Robot [Mon, 16 Apr 2018 05:40:17 +0000 (05:40 +0000)]
Merge "Guard the SSID with NETWORK_SETTINGS" into pi-dev
Tyler Gunn [Mon, 16 Apr 2018 05:38:14 +0000 (22:38 -0700)]
Merge "Add permission whitelist for EmergencyInfo app." am:
3fb7c4740e
am:
bd96a65d1c
Change-Id: Ie8a16b9a210ffe4bc03ccc4a722210eff14992d2
Tyler Gunn [Mon, 16 Apr 2018 05:26:00 +0000 (22:26 -0700)]
Merge "Add permission whitelist for EmergencyInfo app."
am:
3fb7c4740e
Change-Id: I69727fb3f6854c190b570ada33560c2dbf2d76c5
Bernie Innocenti [Mon, 16 Apr 2018 05:24:29 +0000 (05:24 +0000)]
Merge "Teach ApfGenerator about the new opcodes for accessing data memory"
Bill Yi [Mon, 16 Apr 2018 04:54:36 +0000 (21:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
214b3378e6 -s ours
Change-Id: I224cf156839a475d6f82cd4c8a7b841f0bbf0d39
Bill Yi [Mon, 16 Apr 2018 04:48:28 +0000 (21:48 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I06dbe1dfd8098c454295925a57df4e1ac7a41d7e
TreeHugger Robot [Mon, 16 Apr 2018 04:42:35 +0000 (04:42 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Chalard Jean [Mon, 16 Apr 2018 03:25:22 +0000 (12:25 +0900)]
Guard the SSID with NETWORK_SETTINGS
Bug:
77865258
Test: manual
Change-Id: I01d4ec7366382d42847c823ae6056222a012c504
Bill Yi [Mon, 16 Apr 2018 04:29:07 +0000 (21:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I61e1929cbf38843fcce516c103cd51e4e03ae10c
Tyler Gunn [Mon, 16 Apr 2018 04:18:00 +0000 (04:18 +0000)]
Merge "Add permission whitelist for EmergencyInfo app."
Bill Yi [Sun, 15 Apr 2018 14:16:58 +0000 (07:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I5dc789af62825582ca94133ab6721152b2b6871f
hughchen [Sat, 31 Mar 2018 09:32:53 +0000 (17:32 +0800)]
Add new function to get audio state
* Add getAudioState()
* Add isA2dpDevice() and isHfpDevice() in CachedBluetoothDevice
Bug:
74134939
Test: make RunSettingsLibRoboTests -j40
Change-Id: I18f4c1fcad0325a57de379f5ffe5b1135a00d084
Yohei Yukawa [Sun, 15 Apr 2018 04:03:46 +0000 (21:03 -0700)]
Merge "Respect light nav bar flag set by IME on keyguard" into pi-dev
am:
52842feb14
Change-Id: I7c7230e4a46efd41f7dc556cc9c698d4b5499003
HJ ChangLiao [Sun, 15 Apr 2018 03:55:24 +0000 (20:55 -0700)]
Merge "Add new category key for ConnectDeviceFrag" into pi-dev
am:
6a7190cb97
Change-Id: Iafb52f567ff23925d28f1d0356553e398471cbe8
Philip P. Moltmann [Sun, 15 Apr 2018 03:43:24 +0000 (20:43 -0700)]
[automerger skipped] Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev am:
4cfd9bb78d -s ours
am:
aeff32e789
Change-Id: I344703c6effcc4902d11b882056736541257f6b8
Milo Sredkov [Sun, 15 Apr 2018 03:34:19 +0000 (20:34 -0700)]
Address visual inconsistency in smart replies
am:
a5bacea405
Change-Id: I03488013ecd3c97083ecf3158e5ece5300406487
Dmitry Dementyev [Sun, 15 Apr 2018 03:26:07 +0000 (20:26 -0700)]
Merge "Don't create recovery snapshot until it contains at least one key." into pi-dev
am:
8d1ff46dfc
Change-Id: I9482195d01d157b7819674e18c04288ef3a8d3dc
TreeHugger Robot [Sun, 15 Apr 2018 02:55:53 +0000 (02:55 +0000)]
Merge "Respect light nav bar flag set by IME on keyguard" into pi-dev
Lifu Tang [Sun, 15 Apr 2018 02:47:11 +0000 (19:47 -0700)]
Merge "Add an action to launch scanning settings" into pi-dev
am:
4af3d1a4a4
Change-Id: I8e15c04b225ceb2792a2ca2d41c405922c02e482
Philip P. Moltmann [Sun, 15 Apr 2018 02:16:29 +0000 (19:16 -0700)]
Merge "(P) Revoke permision when group changed" into pi-dev
am:
7081085d6d
Change-Id: I97fd9bb2f15f7adfead96efd8475a9af0b127cf6
Brad Stenning [Sun, 15 Apr 2018 02:11:12 +0000 (19:11 -0700)]
Merge "Fix facetbuttons selection It didn't work when apps where in a virtual or secondary dispaly" into pi-dev
am:
7091b5a833
Change-Id: Ie9feb8914ec56179ee1ff0af3d5e7e7cca68c6c4
Chong Zhang [Sun, 15 Apr 2018 01:52:52 +0000 (18:52 -0700)]
Merge "Use heif embedded thumbnail if available" into pi-dev
am:
11d203ea0d
Change-Id: I99ecf1986d921c00f70e7b9dbd2a8c67c5c9a923
Jeff Sharkey [Sun, 15 Apr 2018 01:42:05 +0000 (18:42 -0700)]
Merge "Benchmarks for streams." into pi-dev
am:
59abd6aa25
Change-Id: I7512dd383285f1db91f77ea0bc981e7e745d7016
Jeff Sharkey [Sun, 15 Apr 2018 01:39:00 +0000 (18:39 -0700)]
Merge "Return "null" cycles for deprecated callers." into pi-dev
am:
9eb0a655cc
Change-Id: Ibe9928effca29598c59f440018977474debbee4b
Fyodor Kupolov [Sun, 15 Apr 2018 01:35:27 +0000 (18:35 -0700)]
Merge "Only check bg restriction if an app is idle" into pi-dev
am:
a6ee4a4970
Change-Id: I5c36cd20b4d3dbd8057a8a79b92008834221035f
Jeff Sharkey [Sun, 15 Apr 2018 01:11:58 +0000 (18:11 -0700)]
Merge "OP_GET_USAGE_STATS should be noted, not checked." into pi-dev
am:
64bbb2014e
Change-Id: I38f5aecdb94c8b886ca4eba5908ab1b4a9c1fb89
Hansong Zhang [Sun, 15 Apr 2018 00:47:05 +0000 (17:47 -0700)]
Merge "Add HFP/HearingAid set/get action device to greylist" into pi-dev
am:
6b30886afd
Change-Id: I32e6f4a9263d655650d623207350a921f1b104d8
Christopher Tate [Sun, 15 Apr 2018 00:43:16 +0000 (17:43 -0700)]
Merge "Correct lookback for while-idle alarm rate limiting" into pi-dev
am:
b80f4acec7
Change-Id: I94d662b5f7c05fb49610d045e2ad9cd7ff6f99ad
Jeff Sharkey [Sun, 15 Apr 2018 00:39:59 +0000 (17:39 -0700)]
Merge "Don't process broadcasts until really ready." into pi-dev
am:
fcc07b53fa
Change-Id: I898d5c2d351951a7c016cbc70cb81210a9e18b26
Salvador Martinez [Sun, 15 Apr 2018 00:34:03 +0000 (17:34 -0700)]
Merge "Add constant for bluetooth fragment" into pi-dev
am:
fd56770fb6
Change-Id: Ia22b7dd996d424b5ff1cb05b1d3f86df87124dd2
Brad Ebinger [Sun, 15 Apr 2018 00:29:07 +0000 (17:29 -0700)]
Merge "Update Docs to clarify using a Message across IPC" into pi-dev
am:
4558c77d5d
Change-Id: Ie1a0be63d26136f14cd30c354b889ec0311cc7ee
Brad Ebinger [Sun, 15 Apr 2018 00:25:44 +0000 (17:25 -0700)]
Merge "Adds a private field to parceled data." into pi-dev
am:
63a6bc6794
Change-Id: Ib87a7af0654cc1ec0db052d8ee72f4c74c0aea04
y [Sun, 15 Apr 2018 00:21:50 +0000 (17:21 -0700)]
[automerger skipped] [automerger] ResStringPool: Fix security vulnerability am:
7e54c3f261 am:
98e2d2ec50 am:
24a89da344 am:
d85632ae40 am:
927b3357fa am:
79d0fb2530 am:
a509e771ba am:
80e36faa72 am:
76d71fa910 am:
86cfcaa610 am:
4f5e234020 am:
5604680766 -s ours
am:
19c4ef269f -s ours
Change-Id: I852616ae9734355326c02a632ee9826510dc5d50
Philip P. Moltmann [Sat, 14 Apr 2018 23:37:25 +0000 (16:37 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am:
cda08919cf
am:
d139755de8
Change-Id: I3607d28823ced42c14d39d99bbfd8ea346cfc835
OSDN Git Service
