Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,881 Commits 3 Branches 0 Tags
104f8053370f9e01ac2e8e23bc31d128e5fcc00b
Commit Graph

253881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ajay Panicker
3758253ae8 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a 
am: 271e34dbd5

Change-Id: I954b8f2d9333fa6bb549dc812733d2b8f71220b9
 2016-09-20 23:55:44 +00:00
Ajay Panicker
a278a1e660 Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev 
am: 204da8aa9e

Change-Id: I0ff3b20fc2f3318070e343dfe6dc29b2979284ef
 2016-09-20 23:49:13 +00:00
Ajay Panicker
271e34dbd5 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) 
am: edae39d59a

Change-Id: I2bdf5c6fc24fd370e2555585e8492558040c0d10
 2016-09-20 23:49:05 +00:00
Ajay Panicker
bb9b38b957 [DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) 
setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.

This is restricted to BLUETOOTH_PRIVILEGED permission.

Bug: 29043989
Change-Id: Iddc935f0b02f5ff56e930914b4b664377e786184
 2016-09-20 23:47:09 +00:00
TreeHugger Robot
204da8aa9e Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)" into klp-dev 2016-09-20 23:45:00 +00:00
Daniel Nishi
4bd88df1fb Add a hidden action to trigger the storage manager settings. 
Bug: 31621740
Change-Id: I3ad0b65b0810d468e1f297c7ad312ea8a919ea2a
 2016-09-20 16:42:19 -07:00
Jeff Sharkey
f6e9b95127 Check if anyone could possibly provide service. 
If no service is present that could satisfy a given ServiceWatcher,
then return false.  For example, on devices were there is no Geocoder
service implementation, we need to avoid claiming that the API is
supported.

Test: booted
Bug: 30837973
Change-Id: Ib0834cf1a12623733f8b472dc3da7b3e2adc4515
 2016-09-20 23:31:06 +00:00
Josh Horwich
bad468ad5b Merge "Docs: Fix manifest example for ARC" into nyc-dev am: 7980e4522e 
am: df80f760c0

Change-Id: I23ff226d42c2f51f433ed8b58cf0835927c7dda1
 2016-09-20 23:08:56 +00:00
Josh Horwich
5fc2f23ee6 Docs: Fix manifest example for ARC am: 8960d0a712 
am: cf3ba02ac2

Change-Id: Ia029f9848a8230d692ee1464917b8ec02eb2e1c4
 2016-09-20 23:07:45 +00:00
TreeHugger Robot
07d798b902 Merge "Removing private system ui flags from status bar flags logic." into nyc-mr1-dev 2016-09-20 23:00:37 +00:00
Josh Horwich
df80f760c0 Merge "Docs: Fix manifest example for ARC" into nyc-dev 
am: 7980e4522e

Change-Id: I1f05893d3d78fd58461f055843b6fc7f3d4efcfa
 2016-09-20 23:00:35 +00:00
Josh Horwich
cf3ba02ac2 Docs: Fix manifest example for ARC 
am: 8960d0a712

Change-Id: Ibef775ee00173f2fab0f55d3b38f2ddd641d2e67
 2016-09-20 23:00:29 +00:00
TreeHugger Robot
7980e4522e Merge "Docs: Fix manifest example for ARC" into nyc-dev 2016-09-20 22:54:31 +00:00
Adrian Roos
56a70e3865 Merge "Fix black wallpaper after repeated crashes" into nyc-mr1-dev 2016-09-20 22:42:49 +00:00
Adarsh Fernando
5119df7fbc Temporary redirect for CMake Variables list. am: c9905d9184 
am: 45a63d1eac

Change-Id: Iebf9174254f85097d6be1228974877402005800f
 2016-09-20 22:39:29 +00:00
Adarsh Fernando
45a63d1eac Temporary redirect for CMake Variables list. 
am: c9905d9184

Change-Id: I9fe19c01e4c5bad39d7041b748cbe547d69c8e5e
 2016-09-20 22:34:54 +00:00
Selim Cinek
8a71ad032f Large icons now scale nicer when expanding bundles 
Fixes: 	27597173
Change-Id: I5df234d58903b87cbef5df8812e48992b435fca8
 2016-09-20 15:04:31 -07:00
TreeHugger Robot
f902fb5fa8 Merge "For pre-N apps, cascade LOCATION and DROP events." into nyc-mr1-dev 2016-09-20 22:03:07 +00:00
Scott Main
9f5f8b93db Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev am: a1c28fa8d8 
am: 5f67892f58

Change-Id: I5bb957020def4d2440034f1a6f7ca114beee64c6
 2016-09-20 21:13:34 +00:00
smain@google.com
6e9cbd9785 update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20") am: 0e98b64adf 
am: f60f4f0b6f

Change-Id: Ia9c2afbd4e605f499b24d74b54468300d9971413
 2016-09-20 21:09:08 +00:00
Mary Yanchar
6f300c1729 Merge "Small change for new sample test code" into nyc-dev am: e5e9265e09 
am: c9ac62857d

Change-Id: Iede40ce493f46da6d74038e222c820993b6bb072
 2016-09-20 21:03:12 +00:00
Mary Yanchar
4b830c5a70 Small change for new sample test code am: acb3eb39da 
am: 2fba2c8c1b

Change-Id: I07502f5d1234d9b62836624777d4c5b015b10158
 2016-09-20 21:00:05 +00:00
Scott Main
5f67892f58 Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev 
am: a1c28fa8d8

Change-Id: I8db5871bb6b0bfd20dfe7912bc66b46ea6802f69
 2016-09-20 20:59:39 +00:00
smain@google.com
f60f4f0b6f update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20") 
am: 0e98b64adf

Change-Id: Ie25fbd6aaccdca318c4d7635e0d1f9e013aafb70
 2016-09-20 20:59:35 +00:00
Adarsh Fernando
c9905d9184 Temporary redirect for CMake Variables list. 
Change-Id: I7d6fd1afaa342d74bbede2721a6b8d3a2117fb25
 2016-09-20 13:53:25 -07:00
Scott Main
20c5ca92c3 Merge changes from topic 'n-versioncode' into nyc-dev am: 99ec81ab46 
am: 1c944335cb

Change-Id: I1ba8c5bc910bb4727ed59b8e758c7e94006e98df
 2016-09-20 20:48:43 +00:00
Mary Yanchar
c9ac62857d Merge "Small change for new sample test code" into nyc-dev 
am: e5e9265e09

Change-Id: Ia0b11bfa66bf25950afa5304ca1de3be4cb9207c
 2016-09-20 20:48:40 +00:00
Mary Yanchar
2fba2c8c1b Small change for new sample test code 
am: acb3eb39da

Change-Id: I72196654f922a7ef46ab5903e1bd7f9409330076
 2016-09-20 20:48:36 +00:00
Dianne Hackborn
4f6e7f148d A little more on issue #30766518: Document what targeting N does am: da6be5b871 
am: c8bf8951c2

Change-Id: I83fd73bbda973de2667631dc77fc06b83051bc4e
 2016-09-20 20:47:48 +00:00
Android Build Merger (Role)
af5f7d8e97 Merge "resolve merge conflicts of 491bc2b to nyc-dr1-dev am: 45bf970ebc" into nyc-mr1-dev 2016-09-20 20:34:38 +00:00
smain@google.com
e609ec63f0 resolve merge conflicts of 491bc2b to nyc-dr1-dev 
am: 45bf970ebc

Change-Id: I12ce82b5faa5fc050e7f30b3aae06e9f022d36f0
 2016-09-20 20:33:57 +00:00
Scott Main
1c944335cb Merge changes from topic 'n-versioncode' into nyc-dev 
am: 99ec81ab46

Change-Id: I9b658d156929e6d958bc517d4fc38c8cd987eb2f
 2016-09-20 20:33:06 +00:00
TreeHugger Robot
1ec6ccdafc Merge "Protect against crash on user switch" into nyc-mr1-dev 2016-09-20 20:33:05 +00:00
Dianne Hackborn
c8bf8951c2 A little more on issue #30766518: Document what targeting N does 
am: da6be5b871

Change-Id: I6d08893a3190e7f92c56f4b220e79e8310bb0b2e
 2016-09-20 20:33:01 +00:00
TreeHugger Robot
0ef6986379 Merge "For pre-N apps, keep entered all parents of an drag-entered child." into nyc-mr1-dev 2016-09-20 20:27:25 +00:00
Scott Main
a1c28fa8d8 Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev 2016-09-20 20:26:12 +00:00
Chris Tate
e6fe1287c9 Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev 2016-09-20 20:08:15 +00:00
TreeHugger Robot
e4a53a3677 Merge "Fix data disabled icons in RTL" into nyc-mr1-dev 2016-09-20 20:04:09 +00:00
Fan Zhang
51365c3b4c Fix NPE for WifiConfiguration in AccessPoint. 
In getSummary methods, make a local reference to WifiConfig before
accessing the fields to prevent member variable mConfig being reset in a
different thread.

Bug: 31617798
Test: manually open/close/refresh wifi settings and see no crash.

Change-Id: I254cb3cb59dead425a9ada17d9e84a7e2974f738
 2016-09-20 19:31:27 +00:00
Jason Monk
6e6af2c7ee Protect against crash on user switch 
Somehow one of the tiles doesn't have a view yet. Assume that this
is a transient part of the tiles getting recreated and that the skipped
tile will get picked up in the next layout.

Change-Id: Ia1370d66119bfcfa7b00bd087bcb0d72a072666a
Fixes: 31394359
 2016-09-20 14:53:28 -04:00
smain@google.com
0e98b64adf update metadata for the studio landing page cards (for 2.2 content) 
edit landing page banner ("a dozen" --> "20")

Change-Id: Iccad4faab12930eac9fe58b5c84ba08d444fbee6
 2016-09-20 18:41:56 +00:00
smain@google.com
45bf970ebc resolve merge conflicts of 491bc2b to nyc-dr1-dev 
Change-Id: Ice6c0ba347e0dc0d01b425faec0db37a2d65b8a2
 2016-09-20 11:40:07 -07:00
Doris Ling
b4b96040e0 Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev 2016-09-20 18:26:47 +00:00
Jason Monk
a138395cc8 Fix data disabled icons in RTL 
Change-Id: Idfde6cbb3f1e19c44f33fda98c8c94d795a7763b
Fixes: 30130440
 2016-09-20 14:21:19 -04:00
Mary Yanchar
e5e9265e09 Merge "Small change for new sample test code" into nyc-dev 2016-09-20 18:19:24 +00:00
Amit Mahajan
71e9ea6770 Added new config to indicate uneditable APN fields. 
Bug: 30457714
Change-Id: I2e089f16a7f4e77b8f0bdd10e0c63bbc4a3a11a1
 2016-09-20 10:58:57 -07:00
Yohei Yukawa
786cec2f00 Merge "Fix another deadlock between IMMS and TSMS" into nyc-mr1-dev 2016-09-20 17:53:29 +00:00
Lorenzo Colitti
7b68411de0 Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev 
am: 59266eec4e

Change-Id: I3cd85b815b1202b9291eacc986b131a020fefcd3
 2016-09-20 17:16:19 +00:00
Lorenzo Colitti
cac09035f2 Add debug output for bad wifi avoidance restrictions. 
am: 29bd384f2c

Change-Id: I17e42fb80763a9d48049db9d0785b54bd5005797
 2016-09-20 17:15:50 +00:00
Lorenzo Colitti
aab02df195 Support "don't ask again" in the avoid bad wifi dialog. 
am: 165c51c0eb

Change-Id: Ic6a1917a83e2d847bd673790e2c36f7316ca7acd
 2016-09-20 17:14:50 +00:00