Commit Graph

255075 Commits

Author SHA1 Message Date
TreeHugger Robot
691e49b47c Merge "docs: September 2016 Dashboard update" into nyc-dev 2016-09-13 05:52:22 +00:00
Kevin Hufnagle
5251c874cc Merge "docs: Added note about permission/feature changes with network/GPS." into nyc-dev 2016-09-13 05:49:30 +00:00
Joe Fernandez
639fd11067 docs: September 2016 Dashboard update
Change-Id: I55b5e4d64ec6ff3275a616169fe159b2dfd6c91f
2016-09-12 21:32:47 -07:00
Scott Main
69ba6af8ec Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568" into nyc-dev
am: bf5f1674c7

Change-Id: I4aba2ed155272183204a53f13f6d8a548819fe38
2016-09-12 21:55:15 +00:00
smain@google.com
7ea5a1c2dc update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568
am: b433d73843

Change-Id: I293f8176bc5992494d64113fcf26bd4ed24c37f9
2016-09-12 21:55:02 +00:00
Scott Main
dadbe90eb7 Merge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev
am: b42e41e9c8

Change-Id: I85f0c0e2adeeb0b057a419d773ab6b8d34d170f5
2016-09-12 21:49:59 +00:00
smain@google.com
70286c7e70 add link for how to update the gradle plugin. bug: 23725775
am: 3d5a4c9eda

Change-Id: I830356c88dde5667f892bbfca2d7642a30575b6d
2016-09-12 21:49:49 +00:00
Scott Main
bf5f1674c7 Merge "update Cloud Test Lab guide for Firebase / Studio 2.2. Originally written by Aaron Carey. bug: 30400568" into nyc-dev 2016-09-12 21:42:29 +00:00
Scott Main
b42e41e9c8 Merge "add link for how to update the gradle plugin. bug: 23725775" into nyc-dev 2016-09-12 21:41:26 +00:00
Felipe Leme
603a2174e5 Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only." am: 1bb0616c56 -s ours
am: 04829c4ddd  -s ours

Change-Id: I87396b8ffe7937ad2264c569246f87a9a819e4f9
2016-09-12 21:18:13 +00:00
Felipe Leme
04829c4ddd Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only."
am: 1bb0616c56  -s ours

Change-Id: I281ad8d15f59927185e6beaf209c609f2282ef61
2016-09-12 21:14:10 +00:00
Treehugger Robot
1bb0616c56 Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only." 2016-09-12 21:07:40 +00:00
Mitchell Wills
cb38f6fbb8 Merge "Add a flag to indicate if a ScanData is for a scan for all channels" am: c7b84e6d0d
am: d8a5904abe

Change-Id: I92f3dc3aa1f3f110426965ec232e2a8b0b5f068b
2016-09-12 21:04:49 +00:00
Robert Sesek
a827c78a96 Merge changes I104e6133,I54f04c03 am: 191ddb0c27
am: 80c75db311

Change-Id: Ic8a6c7776418240154ec350dd1f72638b4129c18
2016-09-12 21:04:43 +00:00
Robert Sesek
08435fd419 Split the zygote logic out of android.os.Process into a new ZygoteProcess class. am: 96b49848e7 -s ours
am: b25389bda0

Change-Id: I761f8ba65fa94be276da16435286313e96d583df
2016-09-12 21:03:03 +00:00
Tobias Sargeant
209f78f6d3 Refactor ZygoteInit to support a WebView-specific zygote. am: b9679dc1fa -s ours
am: e38df31d10

Change-Id: I4ac69d33f4a46294bc1437fb574f30412033ed01
2016-09-12 21:02:02 +00:00
Mitchell Wills
d8a5904abe Merge "Add a flag to indicate if a ScanData is for a scan for all channels"
am: c7b84e6d0d

Change-Id: I8c874c282db93dbb531c9c7e27540044c446144e
2016-09-12 20:54:46 +00:00
Robert Sesek
80c75db311 Merge changes I104e6133,I54f04c03
am: 191ddb0c27

Change-Id: I7376f7594314c26926c3b41ffbe4202b865f9091
2016-09-12 20:54:42 +00:00
Robert Sesek
b25389bda0 Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
am: 96b49848e7  -s ours

Change-Id: I2796758fa0a083ade4b4186eae7210c841c719ed
2016-09-12 20:54:39 +00:00
Tobias Sargeant
e38df31d10 Refactor ZygoteInit to support a WebView-specific zygote.
am: b9679dc1fa  -s ours

Change-Id: I6071cb6e8ed2f85351c9fc23f88beed0c6b1fdc9
2016-09-12 20:52:36 +00:00
Mitchell Wills
c7b84e6d0d Merge "Add a flag to indicate if a ScanData is for a scan for all channels" 2016-09-12 20:38:20 +00:00
Wyatt Riley
32d82b0fef LocationManager - Handle Shutdown for right User
am: a8037fffd3

Change-Id: I0fa5f32154e040c16f3fcff1d7454443c93f6691
2016-09-12 20:33:16 +00:00
Wyatt Riley
a8037fffd3 LocationManager - Handle Shutdown for right User
Only process a shutdown when it is for all users (whole system),
not a single user

Change-Id: Id51b7fb4606460462c2f6749e5ac3984bdd8319f
Bug: 30646142
(cherry picked from commit 1b24fb17b8)
2016-09-12 20:13:55 +00:00
Treehugger Robot
191ddb0c27 Merge changes I104e6133,I54f04c03
* changes:
  Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
  Refactor ZygoteInit to support a WebView-specific zygote.
2016-09-12 19:42:02 +00:00
Eino-Ville Talvala
885c6de358 Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev
am: e93c655093  -s ours

Change-Id: I9652b84387a9edaf628c00bae3efa4020292d6f2
2016-09-12 19:26:40 +00:00
Eino-Ville Talvala
ad0fbe0612 DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method
am: e175aa82b5  -s ours

Change-Id: I6fdae71d780f5214d19474bfaa6d5544419e5ef4
2016-09-12 19:24:56 +00:00
Eino-Ville Talvala
e93c655093 Merge "DO NOT MERGE ANYWHERE: ImageReader: Add discardFreeBuffers method" into nyc-dev 2016-09-12 19:20:06 +00:00
smain@google.com
3d5a4c9eda add link for how to update the gradle plugin.
bug: 23725775

Change-Id: I5338cec2fed09b4b91e063d989b311d027b169ed
2016-09-12 12:07:26 -07:00
Andrew Solovay
f6f8f34653 Merge "docs: Updated for Support Library 24.2.1" into nyc-dev
am: 2f4c688710

Change-Id: Ib270874dfcc55c21d41a5dc393f42130f1fea609
2016-09-12 18:54:20 +00:00
Andrew Solovay
1cd14ceff5 docs: Updated for Support Library 24.2.1
am: 88082e9ff8

Change-Id: I835121af05716f91663e74c4a5f4b78da670ee40
2016-09-12 18:54:14 +00:00
Andrew Solovay
2f4c688710 Merge "docs: Updated for Support Library 24.2.1" into nyc-dev 2016-09-12 18:45:08 +00:00
Mitchell Wills
9bc78e8a25 Add a flag to indicate if a ScanData is for a scan for all channels
BUG=30897947

Change-Id: I919d7fa9c3bf196371e506d23e393a9d609a5b4b
(cherry picked from commit 4bfb391c91)
2016-09-12 11:28:55 -07:00
John Reck
aa394dd42c Ensure munmap matches mmap
Bug: 31350622
Change-Id: I6d3f9faec32d54360caa6706d17405e20b50966c
2016-09-12 17:53:14 +00:00
Elliott Hughes
ad38fd7114 Merge "Move frameworks/base to std::unique_ptr." am: a4739b86b5
am: 96b3bc7aff

Change-Id: Iac739b0a727558893696b8d8454d63dfb39c548a
2016-09-12 17:07:44 +00:00
Elliott Hughes
96b3bc7aff Merge "Move frameworks/base to std::unique_ptr."
am: a4739b86b5

Change-Id: Ib07b6585faf4a8b3cc1c2f3e46f1ee27b4865db2
2016-09-12 17:00:09 +00:00
Elliott Hughes
a4739b86b5 Merge "Move frameworks/base to std::unique_ptr." 2016-09-12 16:50:18 +00:00
Michael Wright
b4fcc6136e DO NOT MERGE Track generics in API definition.
Bug: 24265043

Change-Id: Icd810adbfe93d542beeb00eeb9c3fb13cb97c0a5
2016-09-12 17:16:49 +01:00
Dianne Hackborn
a0e55c43c2 DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
2016-09-12 17:16:44 +01:00
Tobias Thierer
91ca970dfc API: Update ResourceBundle to OpenJDK8u60
Test: make update-api

Change-Id: I1a7acbb02c633e46b237493b22d9d4d470945dd0
2016-09-12 17:07:20 +01:00
yuanhuihui
05efd438fe fix persistent process is killed and restart again and again
start presistent app  before system booting, in NewProcessRecordLocked
will set  persistent = true, but not set r.maxAdj = ProcessList.PERSISTENT_PROC_ADJ.
so this process  may become CACHED_EMPTY, then be killed.
while persistent = true, will restart again.

https://code.google.com/p/android/issues/detail?id=222224

Change-Id: I91b405ca3f3bbe8934e4a495d9a54eab4f51e21f
2016-09-12 17:52:18 +08:00
Elliott Hughes
93bb56ef15 Move frameworks/base to std::unique_ptr.
Bug: http://b/22403888
Change-Id: Iae2c68b00be7cd9dd215a75cf80b16d7403f6328
2016-09-11 14:50:12 -07:00
Chih-hung Hsieh
68b9ebcd59 Merge "Fix google-explicit-constructor warnings in media utils." am: 5e91082b3c
am: d1dd5ae76b

Change-Id: I71778eb5a253ebf5342f863d34e178513d386783
2016-09-10 17:20:37 +00:00
Chih-hung Hsieh
d1dd5ae76b Merge "Fix google-explicit-constructor warnings in media utils."
am: 5e91082b3c

Change-Id: I4bb1f347db727e86c1255ccbb0e15dc9cc00169f
2016-09-10 17:15:05 +00:00
Chih-hung Hsieh
5e91082b3c Merge "Fix google-explicit-constructor warnings in media utils." 2016-09-10 17:07:53 +00:00
Sungsoo
c3041a5a79 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 1bdd10a953 am: b336cce830 am: d07324fe85 -s ours am: f495cf6944 -s ours am: 9f37a8900e am: 40d3c1a7f0 am: 2ddc2956fd -s ours am: deeb0e5246 am: 8ec076623b am: 89e328770d am: d98163c7a6 -s ours
am: 054d2931a0

Change-Id: I42e7db05b2990a5e5818bbee31a96ad346360fa7
2016-09-10 00:55:19 +00:00
Sungsoo
054d2931a0 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 1bdd10a953 am: b336cce830 am: d07324fe85 -s ours am: f495cf6944 -s ours am: 9f37a8900e am: 40d3c1a7f0 am: 2ddc2956fd -s ours am: deeb0e5246 am: 8ec076623b am: 89e328770d
am: d98163c7a6  -s ours

Change-Id: Iaa9d3a28872d990cb5196086f9deaaa1d03336cc
2016-09-10 00:30:22 +00:00
Sungsoo
d98163c7a6 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 1bdd10a953 am: b336cce830 am: d07324fe85 -s ours am: f495cf6944 -s ours am: 9f37a8900e am: 40d3c1a7f0 am: 2ddc2956fd -s ours am: deeb0e5246 am: 8ec076623b
am: 89e328770d

Change-Id: I400b511b84f599ea05fb33a5db5dbc8da2c031b0
2016-09-10 00:22:56 +00:00
Sungsoo
4e440b2b43 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: aebe2347a7 -s ours am: 3af57850a0 am: c17e29076e am: ca88e604e4 -s ours am: 14bc23be74 am: 2418ef1313 am: e5d9dc7eac am: 0c476fac30 -s ours
am: 0a7a489ce8

Change-Id: I9967a4b21e65463d66b1c80a2e6b649f99b7410c
2016-09-10 00:12:33 +00:00
Sungsoo
89e328770d DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 1bdd10a953 am: b336cce830 am: d07324fe85 -s ours am: f495cf6944 -s ours am: 9f37a8900e am: 40d3c1a7f0 am: 2ddc2956fd -s ours am: deeb0e5246
am: 8ec076623b

Change-Id: Iee2ca5301d261552694bf7dfcc324730e0b967f4
2016-09-10 00:11:48 +00:00
Sungsoo
fad7b15aba DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change am: 659275dc30 am: 8d3e6bd3ef am: dde94fc477 -s ours am: aa1d75f5e7 am: e9a7225bf2 am: bf62cbb95e am: e38a89dfb8 -s ours
am: ebeb3a9d3c

Change-Id: Ie23f344b1e9987641e12db6864146dc75b3211e5
2016-09-10 00:03:30 +00:00