OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Add logic for recording dex files use on disk"
Calin Juravle [Wed, 21 Dec 2016 11:03:07 +0000 (11:03 +0000)]
Merge "Add logic for recording dex files use on disk"

7 years agoMerge "CEC: Dump recent message history for better logging"
TreeHugger Robot [Wed, 21 Dec 2016 07:37:28 +0000 (07:37 +0000)]
Merge "CEC: Dump recent message history for better logging"

7 years agoturn off warning that proto generated code causes.
Joe Onorato [Tue, 20 Dec 2016 20:29:48 +0000 (12:29 -0800)]
turn off warning that proto generated code causes.

Test: make
Change-Id: Ife3006dc16691dd95a2cc3d36c9b8832970601c9

7 years agoFix varargs bug that made incident_report print incorrectly.
Joe Onorato [Tue, 20 Dec 2016 16:21:38 +0000 (08:21 -0800)]
Fix varargs bug that made incident_report print incorrectly.

Test: incident_report 3000
Change-Id: I397677ecd6e50ad143518416c8fa3e408139189b

7 years agoClean up file names for protos
Joe Onorato [Tue, 20 Dec 2016 16:18:32 +0000 (08:18 -0800)]
Clean up file names for protos

Test: cts-tradefed run singleCommand cts -d --module CtsIncidentHostTestCases
Change-Id: Iea2fc81768082e8e01afa8df86e113665020e7f6

7 years agoMerge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a am: a72f5f27d2 am: 4dfe2...
Tim Murray [Wed, 21 Dec 2016 02:14:57 +0000 (02:14 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a am: a72f5f27d2 am: 4dfe21d668
am: 5ff379db34

Change-Id: I8d51249b04b67f45b0f7cbbf25accc66155ae00a

7 years agoMerge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a am: a72f5f27d2
Tim Murray [Wed, 21 Dec 2016 02:10:23 +0000 (02:10 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a am: a72f5f27d2
am: 4dfe21d668

Change-Id: I3840f68322659336d6737747dd86abcca48fa639

7 years agoMerge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a
Tim Murray [Wed, 21 Dec 2016 02:05:58 +0000 (02:05 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." am: d9ce420d9a
am: a72f5f27d2

Change-Id: I172251111ab333e750bc862725a50b7913f20c90

7 years agoMerge "Fix incorrect FIFO cgroup assignment."
Tim Murray [Wed, 21 Dec 2016 01:57:51 +0000 (01:57 +0000)]
Merge "Fix incorrect FIFO cgroup assignment."
am: d9ce420d9a

Change-Id: Ib5c5ee81058ded098d16dba1dfd43096bbd91937

7 years agoMerge "Fix incorrect FIFO cgroup assignment."
Treehugger Robot [Wed, 21 Dec 2016 01:47:55 +0000 (01:47 +0000)]
Merge "Fix incorrect FIFO cgroup assignment."

7 years agoMerge "Adds custom call forwarding block while roaming carrier config key" into nyc...
Brad Ebinger [Wed, 21 Dec 2016 01:40:37 +0000 (01:40 +0000)]
Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev am: 5153e46897
am: 6c7f5eb29e  -s ours

Change-Id: If00328b9e775ba16253daff513d921c9cbbddb94

7 years agoAdds custom call forwarding block while roaming carrier config key am: eab25ae197
Brad Ebinger [Wed, 21 Dec 2016 01:39:20 +0000 (01:39 +0000)]
Adds custom call forwarding block while roaming carrier config key am: eab25ae197
am: f979b94815  -s ours

Change-Id: Ic542f2528198c3e1e39c816ee5f044571666d73f

7 years agoMerge "Adds custom call forwarding block while roaming carrier config key" into nyc...
Brad Ebinger [Wed, 21 Dec 2016 01:34:25 +0000 (01:34 +0000)]
Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev
am: 5153e46897

Change-Id: I1476d383602745c0e11de916c85618e2640eb24e

7 years agoAdds custom call forwarding block while roaming carrier config key
Brad Ebinger [Wed, 21 Dec 2016 01:34:11 +0000 (01:34 +0000)]
Adds custom call forwarding block while roaming carrier config key
am: eab25ae197

Change-Id: Ic638971c4bae7b496e94431ae2c0f35a22261896

7 years agoMerge "Adds custom call forwarding block while roaming carrier config key" into nyc...
Brad Ebinger [Wed, 21 Dec 2016 01:29:07 +0000 (01:29 +0000)]
Merge "Adds custom call forwarding block while roaming carrier config key" into nyc-mr2-dev

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8...
Amin Shaikh [Wed, 21 Dec 2016 01:24:53 +0000 (01:24 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8 am: 18d7a5e95f
am: ddf90dacd4

Change-Id: I8ea23e591cfd690ebbe9fcab463ffc0429ac3eec

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8
Amin Shaikh [Wed, 21 Dec 2016 01:19:48 +0000 (01:19 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392 am: 380341f6c8
am: 18d7a5e95f

Change-Id: I9e0240a30524436d13c60c3a1251064012c6f7bb

7 years agoMerge "Update account visibility API."
TreeHugger Robot [Wed, 21 Dec 2016 01:17:59 +0000 (01:17 +0000)]
Merge "Update account visibility API."

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392
Amin Shaikh [Wed, 21 Dec 2016 01:15:18 +0000 (01:15 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF." am: c1940ef392
am: 380341f6c8

Change-Id: If863fcce014adf2b2c0d866dc14ba59732f57520

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF."
Amin Shaikh [Wed, 21 Dec 2016 01:10:44 +0000 (01:10 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."
am: c1940ef392

Change-Id: If3d909680cbcda0440807db40761c1a84b2cde97

7 years agoMerge "Clear and restore the calling ID."
TreeHugger Robot [Wed, 21 Dec 2016 01:03:06 +0000 (01:03 +0000)]
Merge "Clear and restore the calling ID."

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f7...
Sundeep Ghuman [Wed, 21 Dec 2016 01:01:20 +0000 (01:01 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab am: 6d749fb489 am: c5443c1d5c
am: 2d68d1a13c

Change-Id: I118293afd44dd619c0c039d4aef9c2f22bda338c

7 years agoMerge "Change fillColor for Wi-Fi badges to #FFFFFF."
Treehugger Robot [Wed, 21 Dec 2016 01:00:18 +0000 (01:00 +0000)]
Merge "Change fillColor for Wi-Fi badges to #FFFFFF."

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f7...
Sundeep Ghuman [Wed, 21 Dec 2016 00:56:48 +0000 (00:56 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab am: 6d749fb489
am: c5443c1d5c

Change-Id: Icbe6a2c873cdbe795092589430b15f10545a3cc2

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab
Sundeep Ghuman [Wed, 21 Dec 2016 00:51:49 +0000 (00:51 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache." am: 31a8f712ab
am: 6d749fb489

Change-Id: I711dd2b9d142a3a92ed641b08dd944be329e503a

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache."
Sundeep Ghuman [Wed, 21 Dec 2016 00:43:15 +0000 (00:43 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."
am: 31a8f712ab

Change-Id: Iba52c9ed85a7e35c46b85a9516a81ac5096a6710

7 years agoMerge "Fast-path for ViewGroup#invalidateChild, invalidate tests"
TreeHugger Robot [Wed, 21 Dec 2016 00:34:00 +0000 (00:34 +0000)]
Merge "Fast-path for ViewGroup#invalidateChild, invalidate tests"

7 years agoMerge "Create and implement a CacheListener inside WifiNetworkScoreCache."
Treehugger Robot [Wed, 21 Dec 2016 00:28:47 +0000 (00:28 +0000)]
Merge "Create and implement a CacheListener inside WifiNetworkScoreCache."

7 years agoUpdate account visibility API.
Dmitry Dementyev [Fri, 2 Dec 2016 18:27:45 +0000 (10:27 -0800)]
Update account visibility API.

Remove no longer used functions and in-memory visibility table.
Add stubs for new methods.
Actual implementation will be added in follow up CLs.
Bug: https://b.corp.google.com/issues/33046496
Test: manual tests, cts tests.

Change-Id: I990759b20c57df70bc944e27b84e59b9f77b9bd4

7 years agoClear and restore the calling ID.
Jeremy Joslin [Tue, 20 Dec 2016 22:36:20 +0000 (14:36 -0800)]
Clear and restore the calling ID.

Clear and restore the calling identity in IPC methods after asserting
the caller has the required permissions.

Fixed 2 tests in NetworkScoreServiceTest that were failing due to a
recent refactor.

Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33781319
Change-Id: Icd79751d12dcfe4af8026980aaa1f7bd463468dc

7 years agoMerge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev am: f77ca5fa18
Marie Janssen [Tue, 20 Dec 2016 23:43:28 +0000 (23:43 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev am: f77ca5fa18
am: eac9538c5c

Change-Id: I2eb357a770e8495c989caf0b092adc754b436d9c

7 years agoBluetooth: persist state when turning on from BLE am: fa9bec95a5
Marie Janssen [Tue, 20 Dec 2016 23:42:29 +0000 (23:42 +0000)]
Bluetooth: persist state when turning on from BLE am: fa9bec95a5
am: e7f0fd1d36

Change-Id: I9ba028b7e0b7c366227b20ae36c8ad76fbe3f9d2

7 years agoMerge "Add flags to send package name for feedback." into nyc-mr2-dev am: 72df83d117
Andrew Sapperstein [Tue, 20 Dec 2016 23:39:52 +0000 (23:39 +0000)]
Merge "Add flags to send package name for feedback." into nyc-mr2-dev am: 72df83d117
am: 8392637afd

Change-Id: I2fe1e1de687e6e02bab504773f812e1545b85784

7 years agoMerge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
Marie Janssen [Tue, 20 Dec 2016 23:38:31 +0000 (23:38 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
am: f77ca5fa18

Change-Id: Iee9a1e57f9b6ad0262fa5cedf1fc0daaf9c2fc00

7 years agoBluetooth: persist state when turning on from BLE
Marie Janssen [Tue, 20 Dec 2016 23:38:26 +0000 (23:38 +0000)]
Bluetooth: persist state when turning on from BLE
am: fa9bec95a5

Change-Id: I7fa40c657100032e400af8422b29941771b0e91a

7 years agoresolve merge conflicts of 4e10b37 to master
Andrew Sapperstein [Tue, 20 Dec 2016 23:31:32 +0000 (15:31 -0800)]
resolve merge conflicts of 4e10b37 to master

Change-Id: If5091133617285fdb7f3c0312e9e229ae8e53fe0

7 years agoMerge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 23:29:35 +0000 (23:29 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" into nyc-mr2-dev

7 years agoChange fillColor for Wi-Fi badges to #FFFFFF.
Amin Shaikh [Tue, 20 Dec 2016 23:28:34 +0000 (15:28 -0800)]
Change fillColor for Wi-Fi badges to #FFFFFF.

Bug: 33778046
Test: make
Change-Id: I0cfc2c6d682a2f13e665563fc1c54fa19324af53

7 years agoCreate and implement a CacheListener inside WifiNetworkScoreCache.
Sundeep Ghuman [Tue, 13 Dec 2016 02:05:10 +0000 (18:05 -0800)]
Create and implement a CacheListener inside WifiNetworkScoreCache.

Bug: 33041117
Test: Unit tests
Change-Id: Ic07522062f79223079b84c49210fcfc0217ecd38

7 years agoMerge "Add flags to send package name for feedback." into nyc-mr2-dev
Andrew Sapperstein [Tue, 20 Dec 2016 23:03:54 +0000 (23:03 +0000)]
Merge "Add flags to send package name for feedback." into nyc-mr2-dev
am: 72df83d117

Change-Id: I8a4bba81f402372035eaf37bd5d6489f042b52b9

7 years agoAdd flags to send package name for feedback.
Andrew Sapperstein [Tue, 20 Dec 2016 23:03:26 +0000 (23:03 +0000)]
Add flags to send package name for feedback.
am: 8dc3b870a0

Change-Id: I72a213a36de7459850e3f688569c901c192dcf9a

7 years agoMerge "Add flags to send package name for feedback." into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 22:57:16 +0000 (22:57 +0000)]
Merge "Add flags to send package name for feedback." into nyc-mr2-dev

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5...
Amin Shaikh [Tue, 20 Dec 2016 22:52:43 +0000 (22:52 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5 am: 9209505c85
am: 6a7dbcb63c  -s ours

Change-Id: Ibce63d4610d53e0b0f11267fd805a96dd84c1e8b

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5
Amin Shaikh [Tue, 20 Dec 2016 22:48:15 +0000 (22:48 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd am: a81a4163f5
am: 9209505c85

Change-Id: I4584fa5909f60fa21dec2014c90b3d7dc49a13a9

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd
Amin Shaikh [Tue, 20 Dec 2016 22:39:41 +0000 (22:39 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi" am: f456ddf3fd
am: a81a4163f5

Change-Id: I847b3d07024e025040304f47de88211956d20175

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi"
Amin Shaikh [Tue, 20 Dec 2016 22:35:06 +0000 (22:35 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi"
am: f456ddf3fd

Change-Id: Ie1324197329486e9eeec0bb765441a6fc5bb8a32

7 years agoAdds custom call forwarding block while roaming carrier config key
Brad Ebinger [Mon, 12 Dec 2016 22:57:37 +0000 (14:57 -0800)]
Adds custom call forwarding block while roaming carrier config key

Adds support for supplying custom call forwarding prefixes in the carrier
config. When a prefix supplied in the carrier config is matched to the number
being dialed, we do not complete the call and instead show an error message
on the dialer UI.

Test: Manual
Bug: 30458052
Merged-In: I3149a565b0fd631d69ab0c0f27be509237b80177
Change-Id: I3149a565b0fd631d69ab0c0f27be509237b80177

7 years agoMerge "Expose ScanResult#untrusted as a @SystemApi."
TreeHugger Robot [Tue, 20 Dec 2016 22:30:31 +0000 (22:30 +0000)]
Merge "Expose ScanResult#untrusted as a @SystemApi."

7 years agoMerge "Settings recovery support"
TreeHugger Robot [Tue, 20 Dec 2016 22:28:47 +0000 (22:28 +0000)]
Merge "Settings recovery support"

7 years agoMerge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev am: a03c3e74a4
Tim Murray [Tue, 20 Dec 2016 22:27:23 +0000 (22:27 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev am: a03c3e74a4
am: a6b0ad5821

Change-Id: I7d9cee78b586a9828a0764b93c64e462c3142aae

7 years agoFix incorrect FIFO cgroup assignment. am: 2dc4a74806
Tim Murray [Tue, 20 Dec 2016 22:26:16 +0000 (22:26 +0000)]
Fix incorrect FIFO cgroup assignment. am: 2dc4a74806
am: 220286ef0e

Change-Id: If626ffda197e73ed162535805445bed2a9ebfc87

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi"
Treehugger Robot [Tue, 20 Dec 2016 22:24:13 +0000 (22:24 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi"

7 years agoMerge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
Tim Murray [Tue, 20 Dec 2016 22:17:35 +0000 (22:17 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
am: a03c3e74a4

Change-Id: I3f5633da996140cf88d85e5f997d9e41d48dec45

7 years agoFix incorrect FIFO cgroup assignment.
Tim Murray [Tue, 20 Dec 2016 22:17:29 +0000 (22:17 +0000)]
Fix incorrect FIFO cgroup assignment.
am: 2dc4a74806

Change-Id: I21f7c8a27bf5ee162d7b4567b408ab11eed30ae0

7 years agoMerge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev
TreeHugger Robot [Tue, 20 Dec 2016 22:10:00 +0000 (22:10 +0000)]
Merge "Fix incorrect FIFO cgroup assignment." into nyc-mr2-dev

7 years agoMerge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into...
Manu Cornet [Tue, 20 Dec 2016 22:05:58 +0000 (22:05 +0000)]
Merge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into nyc-mr2-dev am: 5ef12f244c
am: 842b596000  -s ours

Change-Id: I5346c09b3fb8212ea72014a00ddce644449b9553

7 years agoDO NOT MERGE - Port 2D recents implementation from master to nyc-mr2 am: bf8e290376
Manu Cornet [Tue, 20 Dec 2016 22:05:02 +0000 (22:05 +0000)]
DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2 am: bf8e290376
am: 0cfa646f73  -s ours

Change-Id: I9fbe73d56cc345972ba327afe41865af3b57ff63

7 years agoFix incorrect FIFO cgroup assignment.
Tim Murray [Tue, 20 Dec 2016 19:47:24 +0000 (11:47 -0800)]
Fix incorrect FIFO cgroup assignment.

bug 33745094
Test: builds

Change-Id: I46eefc8ea6f17ca3795f4743692ddfea36d5db0f

7 years agoMerge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev am: 2d6accd7a9
Xiaohui Chen [Tue, 20 Dec 2016 21:58:42 +0000 (21:58 +0000)]
Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev am: 2d6accd7a9
am: 77215beb95

Change-Id: I395eba88b3ff9d65932273aa3eef599ebfca3979

7 years agosysui: update sw900dp navbar sizes am: c48f07bc82
Xiaohui Chen [Tue, 20 Dec 2016 21:57:22 +0000 (21:57 +0000)]
sysui: update sw900dp navbar sizes am: c48f07bc82
am: 4ec4c6f212

Change-Id: Ic19cf9436d15dae440cb3c179c455813cee6a337

7 years agoMerge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into...
Manu Cornet [Tue, 20 Dec 2016 21:57:13 +0000 (21:57 +0000)]
Merge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into nyc-mr2-dev
am: 5ef12f244c

Change-Id: Iff1c2fa5c05b891ea478caa2400cbd42f8a1914b

7 years agoDO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
Manu Cornet [Tue, 20 Dec 2016 21:57:08 +0000 (21:57 +0000)]
DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
am: bf8e290376

Change-Id: I7b05418dc2d03da33e862cf67dbcd1d08cb1b899

7 years agoMerge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev
Xiaohui Chen [Tue, 20 Dec 2016 21:52:46 +0000 (21:52 +0000)]
Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev
am: 2d6accd7a9

Change-Id: I07ef49f3fd5fa3ab364f5b527c4e21a1c96e6b3d

7 years agosysui: update sw900dp navbar sizes
Xiaohui Chen [Tue, 20 Dec 2016 21:52:41 +0000 (21:52 +0000)]
sysui: update sw900dp navbar sizes
am: c48f07bc82

Change-Id: Ia9bfece57902625c72eda216464344a40bd25db7

7 years agoMerge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into...
TreeHugger Robot [Tue, 20 Dec 2016 21:50:13 +0000 (21:50 +0000)]
Merge "DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2" into nyc-mr2-dev

7 years agoMerge "Cancels out long press on recents fixed from previous change"
TreeHugger Robot [Tue, 20 Dec 2016 21:47:47 +0000 (21:47 +0000)]
Merge "Cancels out long press on recents fixed from previous change"

7 years agoMerge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev
Xiaohui Chen [Tue, 20 Dec 2016 21:44:22 +0000 (21:44 +0000)]
Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed" am...
Hall Liu [Tue, 20 Dec 2016 21:41:08 +0000 (21:41 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364 am: fc125a319e am: 57c781417f  -s ours
am: cbd67fed49  -s ours

Change-Id: If829c47b72444f722cd64abfb6e333c7ed394feb

7 years agoMerge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf am: e6164ca7...
Andre Eisenbach [Tue, 20 Dec 2016 21:40:06 +0000 (21:40 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf am: e6164ca72a am: bf43955a6b
am: 891a513e01

Change-Id: I3e7b3fb0cc9c8cc9a6377cca9b9e3c54d192fd33

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed" am...
Hall Liu [Tue, 20 Dec 2016 21:36:12 +0000 (21:36 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364 am: fc125a319e
am: 57c781417f  -s ours

Change-Id: Ic021a41d713aaa4f8a4af6cdcc1560b7b718b6e8

7 years agoMerge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf am: e6164ca72a
Andre Eisenbach [Tue, 20 Dec 2016 21:35:03 +0000 (21:35 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf am: e6164ca72a
am: bf43955a6b

Change-Id: I2d41410fcdb6824e45027412a7b80e16af797346

7 years agoMerge "Adds custom call forwarding block while roaming carrier config key"
Brad Ebinger [Tue, 20 Dec 2016 21:31:32 +0000 (21:31 +0000)]
Merge "Adds custom call forwarding block while roaming carrier config key"

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed" am...
Hall Liu [Tue, 20 Dec 2016 21:28:12 +0000 (21:28 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364
am: fc125a319e

Change-Id: I305223c2a5499b9fdf2f1f59ddfda40712cd6172

7 years agoMerge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf
Andre Eisenbach [Tue, 20 Dec 2016 21:27:05 +0000 (21:27 +0000)]
Merge "Bluetooth: persist state when turning on from BLE" am: 8e9551bacf
am: e6164ca72a

Change-Id: I7c27d09c83daf73817585f2713bd2f05b97cd525

7 years agoMerge "Add Wi-Fi quality badge icons." am: edb8982c31 am: 061d4fff4b am: 99a19e8116
Amin Shaikh [Tue, 20 Dec 2016 21:24:18 +0000 (21:24 +0000)]
Merge "Add Wi-Fi quality badge icons." am: edb8982c31 am: 061d4fff4b am: 99a19e8116
am: 2280ecf83a

Change-Id: I8bd8b5d30d72dba4af94609f90af833454b618ae

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed"
Hall Liu [Tue, 20 Dec 2016 21:19:43 +0000 (21:19 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed"
am: 26e5096364

Change-Id: I2ce0958075ec3bd2c337993516ad06ffd264d594

7 years agoMerge "Bluetooth: persist state when turning on from BLE"
Andre Eisenbach [Tue, 20 Dec 2016 21:18:35 +0000 (21:18 +0000)]
Merge "Bluetooth: persist state when turning on from BLE"
am: 8e9551bacf

Change-Id: Iad69e2f184df54ffbb2d7169e45345c80547b010

7 years agoMerge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26...
Alex Klyubin [Tue, 20 Dec 2016 21:17:17 +0000 (21:17 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26 am: be81b50b6e am: e1bc33228e
am: 9c280d1566

Change-Id: I45452e71df0779b69b77e2dd1691a6fa27868e74

7 years agoMerge "Adds carrier config to determine if high definition audio is displayed"
Hall Liu [Tue, 20 Dec 2016 21:13:31 +0000 (21:13 +0000)]
Merge "Adds carrier config to determine if high definition audio is displayed"

7 years agoMerge "Add Wi-Fi quality badge icons." am: edb8982c31 am: 061d4fff4b
Amin Shaikh [Tue, 20 Dec 2016 21:12:55 +0000 (21:12 +0000)]
Merge "Add Wi-Fi quality badge icons." am: edb8982c31 am: 061d4fff4b
am: 99a19e8116

Change-Id: I68d8c31057da94ce90d4193ef2813646782746fa

7 years agoMerge "Bluetooth: persist state when turning on from BLE"
Andre Eisenbach [Tue, 20 Dec 2016 21:11:58 +0000 (21:11 +0000)]
Merge "Bluetooth: persist state when turning on from BLE"

7 years agoBluetooth: persist state when turning on from BLE
Marie Janssen [Tue, 20 Dec 2016 19:21:12 +0000 (11:21 -0800)]
Bluetooth: persist state when turning on from BLE

Test: in BLE_ON state, turn to full on, reboot phone
Bug: 33777496
Change-Id: I246d6ff0dcb81d66aa915ef443040d6fc3c98310

7 years agoBluetooth: persist state when turning on from BLE
Marie Janssen [Tue, 20 Dec 2016 19:21:12 +0000 (11:21 -0800)]
Bluetooth: persist state when turning on from BLE

Test: in BLE_ON state, turn to full on, reboot phone
Bug: 33777496
Change-Id: I246d6ff0dcb81d66aa915ef443040d6fc3c98310

7 years agoAdd flags to send package name for feedback.
Andrew Sapperstein [Fri, 16 Dec 2016 02:10:34 +0000 (18:10 -0800)]
Add flags to send package name for feedback.

Bug: 32189956
Test: make RunSettingsLibRoboTests
Change-Id: I0bd40fdf60b4f3ee21afad6e3f7dc3e4e87212f0
(cherry picked from commit c05c740d606a4a0c4418f34f6cfbc06fbda8d201)

7 years agoMerge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26...
Alex Klyubin [Tue, 20 Dec 2016 21:05:15 +0000 (21:05 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26 am: be81b50b6e
am: e1bc33228e

Change-Id: I80c703f7784436414263fb86f56b7c85a6da40e7

7 years agoSettings recovery support
Svet Ganov [Mon, 7 Nov 2016 20:24:06 +0000 (12:24 -0800)]
Settings recovery support

This change allows the system to perform iterative reset
of changes to settings in order to recover from bad a
state such as a reboot loop.

To enable this we add the notion of a default value. The
default can be set by any package but if the package that
set it is a part of the system, i.e. trusted, then other
packages that are not a part of the system, i.e. untrusted,
cannot change the default. The settings setter APIs that
do not take a default effectively clear the default. Putting
a setting from a system component always makes it the
default and if the package in not trusted then value is
not made the default. The rationale is that the system is
tested and its values are safe but third-party components
are not trusted and their values are not safe.

The reset modes from the least intrusive are: untrusted
defaults - reset only settings set by untrusted components
to their defaults or clear them otherwise; untrusted clear
- clear settings set by untrusted components (or snap to
default if provided by the system); trusted defaults - reset
all settings to defaults set by the system or clear them
otherwise.

Also a package can reset to defaults changes it made to
the global and secure settings. It is also possible to
associate a setting with an optional token which can then
be used to reset settings set by this package and
associated with the token allowing parallel experiments
over disjoint settings subsets.

The default values are also useful for experiment (or
more precisely iterative tuning of devices' behavior in
production) as the stable configuration can be set to
the "graduated" safe defaults and set the values to the
experimental ones to measure impact.

Test: tests pass

Change-Id: I8c23b145d4f8ee0de2f29dedaa4641ac59343d6a

7 years agoMerge changes from topic 'diskstats-update'
TreeHugger Robot [Tue, 20 Dec 2016 21:03:53 +0000 (21:03 +0000)]
Merge changes from topic 'diskstats-update'

* changes:
  Augment diskstats dumpsys to have categorization and apps.
  Add a file collector to the platform.

7 years agoMerge "Add an app size collector."
TreeHugger Robot [Tue, 20 Dec 2016 21:03:53 +0000 (21:03 +0000)]
Merge "Add an app size collector."

7 years agoMerge "Add Wi-Fi quality badge icons." am: edb8982c31
Amin Shaikh [Tue, 20 Dec 2016 20:53:32 +0000 (20:53 +0000)]
Merge "Add Wi-Fi quality badge icons." am: edb8982c31
am: 061d4fff4b

Change-Id: I25b230cbc51cd7079d2c73d116c9e4550fc5b02e

7 years agoMake WifiConfiguration#meteredHint a @SystemApi
Amin Shaikh [Tue, 20 Dec 2016 19:00:34 +0000 (11:00 -0800)]
Make WifiConfiguration#meteredHint a @SystemApi

This allows NetworkRecommendationProviders to set this field on
returned WifiConfigurations.

Test: make
Bug: 33760009
Change-Id: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
Merged-In: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603

7 years agoMerge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26
Alex Klyubin [Tue, 20 Dec 2016 20:45:59 +0000 (20:45 +0000)]
Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26
am: be81b50b6e

Change-Id: I1275903e7fda6bdd9c1012bc7cfb6c42f6b43304

7 years agoMerge "Make WifiConfiguration#meteredHint a @SystemApi"
TreeHugger Robot [Tue, 20 Dec 2016 20:39:55 +0000 (20:39 +0000)]
Merge "Make WifiConfiguration#meteredHint a @SystemApi"

7 years agoMerge "Fix keyboard shortcut display layout"
TreeHugger Robot [Tue, 20 Dec 2016 20:28:32 +0000 (20:28 +0000)]
Merge "Fix keyboard shortcut display layout"

7 years agoMerge "Define the calculateRankingScore method and Key."
TreeHugger Robot [Tue, 20 Dec 2016 20:27:42 +0000 (20:27 +0000)]
Merge "Define the calculateRankingScore method and Key."

7 years agoMerge "Add Wi-Fi quality badge icons."
Amin Shaikh [Tue, 20 Dec 2016 20:24:31 +0000 (20:24 +0000)]
Merge "Add Wi-Fi quality badge icons."
am: edb8982c31

Change-Id: I43d4f52e26eb7514b177d10769d6a5e3fc78f386

7 years agoExpose ScanResult#untrusted as a @SystemApi.
Amin Shaikh [Sat, 10 Dec 2016 01:11:50 +0000 (17:11 -0800)]
Expose ScanResult#untrusted as a @SystemApi.

- Expose ScanResult#untrusted to inform NetworkRecommendationProviders
  that a ScanResult does not correspond to a saved network.
- Add static construction methods and assertions to RecommendationResult

Test: runtest frameworks-services

Bug: 33490132
Change-Id: If7006040f63843c1c468c9d95c5c017383c5c5dd

7 years agoMerge "Add Wi-Fi quality badge icons."
Treehugger Robot [Tue, 20 Dec 2016 20:13:59 +0000 (20:13 +0000)]
Merge "Add Wi-Fi quality badge icons."

7 years agoMerge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2...
Philipp Weiß [Tue, 20 Dec 2016 20:10:59 +0000 (20:10 +0000)]
Merge "DO NOT MERGE Show notification when network logging is enabled" into nyc-mr2-dev am: 2f42cbcad5
am: c10a5dc4ab  -s ours

Change-Id: I35284d792f8d02bae753caedd12db9600c3d462d

7 years agoDO NOT MERGE - Port 2D recents implementation from master to nyc-mr2
Manu Cornet [Tue, 20 Dec 2016 16:29:33 +0000 (08:29 -0800)]
DO NOT MERGE - Port 2D recents implementation from master to nyc-mr2

Bug: 32101881
Test: Checked Recents layout/behavior on local sw600dp device
Change-Id: I40be7dbaf8bc017b4c7c449f9bca657817107ceb

7 years agoDO NOT MERGE Show notification when network logging is enabled am: 923d2cc9d9
phweiss [Tue, 20 Dec 2016 20:09:54 +0000 (20:09 +0000)]
DO NOT MERGE Show notification when network logging is enabled am: 923d2cc9d9
am: dee7669fd2  -s ours

Change-Id: I0db3e7214f51bcce68eca575bd829095ac627e83