drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,083 Commits 1 Branch 0 Tags
Commit Graph

277083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Murashkin
7ab062fd66 Merge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 am: d0d99d8a3d 
am: 4aa38633fe

Change-Id: I5016b537d38a03b494fb3c4a3952af8c054302d3
 2016-10-28 18:00:11 +00:00
Igor Murashkin
4aa38633fe Merge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 
am: d0d99d8a3d

Change-Id: Ia7bea2370daeb77ab23a797546f8f7c437902516
 2016-10-28 17:55:12 +00:00
Igor Murashkin
d0d99d8a3d Merge "app_process: Forward -cp/-classpath to ART." 
am: 4a4a8f1555

Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747
 2016-10-28 17:48:15 +00:00
Treehugger Robot
4a4a8f1555 Merge "app_process: Forward -cp/-classpath to ART." 2016-10-28 17:34:47 +00:00
Przemyslaw Szczepaniak
4ffbf4e72f Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" am: ec3e884e88 am: 29d6af7fe7 
am: 0cf19a9a27

Change-Id: I2e87d2f2a7484b6720152083299b1521f9c517bc
 2016-10-28 12:19:57 +00:00
Przemyslaw Szczepaniak
0cf19a9a27 Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" am: ec3e884e88 
am: 29d6af7fe7

Change-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc
 2016-10-28 12:15:19 +00:00
Przemyslaw Szczepaniak
29d6af7fe7 Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" 
am: ec3e884e88

Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651
 2016-10-28 12:05:56 +00:00
Przemyslaw Szczepaniak
ec3e884e88 Merge "Track libcore change 16fa17012b56e990ced91cd023dee33f96deedf9" 2016-10-28 11:57:07 +00:00
Mitchell Wills
010384868d Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
am: a657136264

Change-Id: Ib597a86f8c79bca3c7db66736bf2cbcd11b29f48
 2016-10-28 06:35:28 +00:00
Mitchell Wills
3d4833bfb8 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
This reverts commit 6a80a4b05acacd3fd07583a3bb6185e9770215eb.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128bb9878971f8b5a85b90b3f303fec0ba)
 2016-10-28 06:20:34 +00:00
Mitchell Wills
a657136264 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
This reverts commit 6a80a4b05acacd3fd07583a3bb6185e9770215eb.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128bb9878971f8b5a85b90b3f303fec0ba)
 2016-10-28 06:19:56 +00:00
Mitchell Wills
f452432e2c Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am: 77281bbaf4 -s ours 
am: e1d1740534

Change-Id: I9b2080a5ea044c1f444b77d4c1d9309fe306f5c8
 2016-10-28 05:04:31 +00:00
Mitchell Wills
e1d1740534 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
am: 77281bbaf4  -s ours

Change-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947
 2016-10-28 04:58:50 +00:00
Mitchell Wills
77281bbaf4 Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" 
This reverts commit 6a80a4b05acacd3fd07583a3bb6185e9770215eb.

Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit b38028128bb9878971f8b5a85b90b3f303fec0ba)
 2016-10-28 03:52:58 +00:00
Jakub Pawlowski
e582ab854d Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 am: 81d5ecb7a6 
am: 61d0088923

Change-Id: I83c82b17064ee958fff6a98d90a0b351205ccf54
 2016-10-28 03:01:56 +00:00
Jakub Pawlowski
61d0088923 Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 
am: 81d5ecb7a6

Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
 2016-10-28 02:56:54 +00:00
Marie Janssen
41319ff65f Merge "Add Bluetooth toggle prompts - framework" am: a062ce698b -s ours am: 98f664b903 
am: 7ad32238f6

Change-Id: If8fa652d1e8607e801f668a3987c0019064472a6
 2016-10-28 02:56:54 +00:00
Marie Janssen
7ad32238f6 Merge "Add Bluetooth toggle prompts - framework" am: a062ce698b -s ours 
am: 98f664b903

Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7
 2016-10-28 02:52:00 +00:00
Jakub Pawlowski
81d5ecb7a6 Merge "Separate LE scanner from GATT client (1/4)" 
am: 87c997ca21

Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
 2016-10-28 02:50:54 +00:00
Marie Janssen
98f664b903 Merge "Add Bluetooth toggle prompts - framework" 
am: a062ce698b  -s ours

Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
 2016-10-28 02:45:26 +00:00
Fyodor Kupolov
8b44db55d3 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e97969b4d0 am: 74bd9b1f56 
am: 9b006e28f9

Change-Id: Icc26dab845ded7813abea322dd3898364a96f4c3
 2016-10-28 00:40:22 +00:00
Fyodor Kupolov
f4fba91b5f [DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6 am: 7c9a91094d 
am: c9102f2ae2

Change-Id: I28e06c6345e847ade9a89824675302fdf58e1ba9
 2016-10-28 00:39:12 +00:00
Fyodor Kupolov
9b006e28f9 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e97969b4d0 
am: 74bd9b1f56

Change-Id: I56b83ec38059af3d15d3ad123ebe96bf7330dbbe
 2016-10-28 00:31:47 +00:00
Fyodor Kupolov
c9102f2ae2 [DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6 
am: 7c9a91094d

Change-Id: I386176cef3812d13a0b5e1583e55b470e4fc312d
 2016-10-28 00:30:43 +00:00
Fyodor Kupolov
74bd9b1f56 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev 
am: e97969b4d0

Change-Id: I0888cc3e628cd004887ecf0cac5fa718dc1d0f15
 2016-10-28 00:21:12 +00:00
Fyodor Kupolov
7c9a91094d [DO NOT MERGE] Only setSize if -s arg is specified 
am: b87a491de6

Change-Id: I33afbd12925a1afb79ed9b444948372ebbaf5e95
 2016-10-28 00:21:10 +00:00
TreeHugger Robot
e97969b4d0 Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev 2016-10-28 00:11:14 +00:00
Jakub Pawlowski
87c997ca21 Merge "Separate LE scanner from GATT client (1/4)" 2016-10-27 23:18:54 +00:00
Jakub Pawlowski
1b49e6eb04 Separate LE scanner from GATT client (1/4) 
Right now, LE scanning functionality is combined with the GATT client.
This is the source of various bugs, like scans suddenly stoppinging when
a GATT client is killed. It also increases memory consumption, because
we associate many structures with a GATT client, which are not necessary
when just scanning.

Test: sl4a BleScanApiTest ConcurrentBleScanTest
Change-Id: I0c25bd4a58bb430eb0ee4100d5f2bbab194f9621
 2016-10-27 23:09:35 +00:00
Marie Janssen
a062ce698b Merge "Add Bluetooth toggle prompts - framework" 2016-10-27 23:07:32 +00:00
Svetoslav Ganov
f9e2ad0b3c Add Bluetooth toggle prompts - framework 
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.

bug:28715749

Change-Id: I94c5828ad6c8aa6b363622a26ff9da4fc2e2fac7
(cherry picked from commit ac69be543f89ea6e9a27204492e0a170d9b3450e)
 2016-10-27 22:49:11 +00:00
Fyodor Kupolov
b87a491de6 [DO NOT MERGE] Only setSize if -s arg is specified 
Calculate size of installed APKs only when INSTALL_EXTERNAL flag is set.
calculateInstalledSize is expensive and may take up to 20% of total
installation time.

Bug: 32180551
Bug: 29932779
Change-Id: I173d2b38820cc86cbfacecd1bacef57369d10af7
 2016-10-27 15:29:41 -07:00
Jeff Sharkey
4c7a2fac3b Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am: 286f069221 am: 32dcd2cad4 
am: 99bfb0dcaa

Change-Id: I24fd77665875ef2f7e2ad231c7de8acabc40a99a
 2016-10-27 20:38:54 +00:00
Jeff Sharkey
ed8259f3fd Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am: 7765d7320d am: eeac5a064d 
am: f46b2eeab6

Change-Id: If4c4ab8ddd7e15a93de6422d8724077f158b1047
 2016-10-27 20:37:32 +00:00
Jeff Sharkey
99bfb0dcaa Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev am: 286f069221 
am: 32dcd2cad4

Change-Id: Iebf13cac5308c3763c90219407437a5d010cd27e
 2016-10-27 20:28:44 +00:00
Jeff Sharkey
f46b2eeab6 Only bind to RESOLVE_EPHEMERAL_PACKAGE once. am: 7765d7320d 
am: eeac5a064d

Change-Id: If0fcf46d1f73662dbc774403e8d9be62585ef4a5
 2016-10-27 20:27:54 +00:00
Jeff Sharkey
32dcd2cad4 Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev 
am: 286f069221

Change-Id: Ie24d27d010b355896e92b911d574576f42417b9b
 2016-10-27 20:23:26 +00:00
Jeff Sharkey
eeac5a064d Only bind to RESOLVE_EPHEMERAL_PACKAGE once. 
am: 7765d7320d

Change-Id: I2ca3b6d7938a461a6fe2d591b74985908c2d07bc
 2016-10-27 20:23:23 +00:00
Michael Kwan
bf6a177198 Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev am: 07192ff60a 
am: 4e830d259a

Change-Id: Iaaa3618b497ec0d547f83e3b5677fd322f7015b3
 2016-10-27 20:20:07 +00:00
Michael Kwan
05aed4e0cd Update progress bar and progress dialog to match UX specs for watch. am: f930e5b99b 
am: c8eb232ba3

Change-Id: I56297d399965b2b03dc41b2cc9d6237c7762c03f
 2016-10-27 20:19:03 +00:00
Jeff Sharkey
286f069221 Merge "Only bind to RESOLVE_EPHEMERAL_PACKAGE once." into nyc-mr1-dev 2016-10-27 20:18:10 +00:00
Michael Kwan
4e830d259a Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev 
am: 07192ff60a

Change-Id: I31c220c68e142cb15b7e6801a88a1aff853229b2
 2016-10-27 20:14:07 +00:00
Michael Kwan
c8eb232ba3 Update progress bar and progress dialog to match UX specs for watch. 
am: f930e5b99b

Change-Id: I5123bba1819fe4841184bcab9cc65d0418c3b2a5
 2016-10-27 20:13:59 +00:00
TreeHugger Robot
07192ff60a Merge "Update progress bar and progress dialog to match UX specs for watch." into cw-f-dev 2016-10-27 20:06:18 +00:00
Leonard Mosescu
c41f617dec Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours" into stage-aosp-master am: 258790a2ea 
am: df87eb4adc

Change-Id: Iafeb38ea7de7b233914e2abc8a251061921bf62a
 2016-10-27 17:39:59 +00:00
Leonard Mosescu
b9b149d9dd Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours am: d73688521c 
am: 8d0cdfb291

Change-Id: I18ce0a2d49ab95c89e8318d009112f3c126b58ad
 2016-10-27 17:39:07 +00:00
Michal Karpinski
9351835591 Extending DNS event reporting am: 6e54239e50 
am: 8c32fd2d33

Change-Id: Ia12eb058152589c62e541f6198880f7ce421023c
 2016-10-27 17:38:18 +00:00
Leonard Mosescu
df87eb4adc Merge "Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours" into stage-aosp-master 
am: 258790a2ea

Change-Id: I82e68dd1ad007b8962f8ee73de2429dbe3e23959
 2016-10-27 17:29:24 +00:00
Leonard Mosescu
8d0cdfb291 Merge "Adding "attach-agent" to ActivityManagerShellCommand" am: bd2688f4c3 -s ours 
am: d73688521c

Change-Id: I67fdb8dcceb791b5984bba37395a73c3be36a992
 2016-10-27 17:29:19 +00:00
Michal Karpinski
8c32fd2d33 Extending DNS event reporting 
am: 6e54239e50

Change-Id: I64e6a48fbbaa734447069b073c3499ef71af907c
 2016-10-27 17:28:15 +00:00