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

220498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Torokhov
d3eee7c410 SystemUI: fix automatic pairing of BT keyboards 
am: 79f00cf06f

* commit '79f00cf06f5e70047d73b48d20910b967353b075':
  SystemUI: fix automatic pairing of BT keyboards
 2015-10-22 18:13:36 +00:00
Michael Wright
40311676d0 Merge "Fixup InputManager javadoc" 2015-10-22 17:54:31 +00:00
Michael Wright
4ecbdbb4fa Merge "Add kernel keycode mapping for new cut / copy / paste keys" 2015-10-22 17:53:43 +00:00
Anthony Hugh
73e82d7857 Merge "Give watch Home app location permissions by default" into cw-e-dev am: 0a3270e00a am: 5f8ac21cac 
am: a7882195a9

* commit 'a7882195a9888b2003c95d34a2d0aa5c53f61b62':
  Give watch Home app location permissions by default
 2015-10-22 17:42:07 +00:00
Anthony Hugh
a7882195a9 Merge "Give watch Home app location permissions by default" into cw-e-dev am: 0a3270e00a 
am: 5f8ac21cac

* commit '5f8ac21cac89077edd50d547b43550296a506d4b':
  Give watch Home app location permissions by default
 2015-10-22 17:36:23 +00:00
Anthony Hugh
5f8ac21cac Merge "Give watch Home app location permissions by default" into cw-e-dev 
am: 0a3270e00a

* commit '0a3270e00ab6bbba5669288f958cc88c8484a587':
  Give watch Home app location permissions by default
 2015-10-22 17:30:05 +00:00
Anthony Hugh
0a3270e00a Merge "Give watch Home app location permissions by default" into cw-e-dev 2015-10-22 17:22:21 +00:00
Dmitry Torokhov
79f00cf06f SystemUI: fix automatic pairing of BT keyboards 
After reset (docking) Pixel C Keyboard that was previously paired with
a device goes into so-called non-discoverable mode, where it will
establish connection only with device that it has connected before. When
scanning for available devices we need to wait till the keyboard starts
advertising itself as discoverable, and only then try to pair.

Also, let's flush the device cache when we attach the base to make sure
the device that we seen before and cached again in the right state after
reset.

Bug: 24915541
Change-Id: I136c1c4235080a25529b4b1c2b1da9bc18508811
 2015-10-22 10:19:32 -07:00
Chris Craik
914e362d18 Merge "Work to support saveLayer in new pipeline" 2015-10-22 17:16:55 +00:00
Nicolas Prevot
ff91ef8ed1 Don't resolve cross-profile app links without intent picker. 
If ALLOW_CROSS_PROFILE_APP_LINKING has been set:
If there is an app with status always across profiles, and some
apps without status always in the current profile: show an intent
picker instead of directly resolving across profiles.

BUG:25109215

Change-Id: I74a67d231284ce912121ea0818109fbf904183e8
 2015-10-22 18:16:39 +01:00
John Reck
c6e7167a93 Merge "Remove obsolete debug option" 2015-10-22 17:05:37 +00:00
John Reck
a672f6ba4c Remove obsolete debug option 
Bug: 25149700
Change-Id: I9280e2414255fb01e672094cd8d173efadac1681
 2015-10-22 09:53:26 -07:00
Steve McKay
5c1b9613da Merge "Don't try to delete files twice." 2015-10-22 16:46:26 +00:00
Steve McKay
edd0575b46 Don't try to delete files twice. 
Also, apply delete in reverse order to placate RecyclerView.
TODO: Refactor this whole stack...needs some love.

Bug: 25091323, 24749296
Change-Id: I84e21c16423048bd50cd988eb1e2a36dc62b9d16
 2015-10-22 09:44:48 -07:00
Michael Wright
112449ca29 Fixup InputManager javadoc 
Change-Id: I708b62db4861c7d391258b980a2447e08ed0d89e
 2015-10-22 17:23:12 +01:00
Alan Viverette
8cab9b5f1d Merge "Reset constant width/height when DrawableContainer density changes" 2015-10-22 15:02:32 +00:00
Alan Viverette
4ae5471c72 Merge "Scale density correctly on VectorDrawable.applyTheme()" 2015-10-22 15:02:01 +00:00
Michael Wright
f6d7c67962 Add kernel keycode mapping for new cut / copy / paste keys 
Bug: 25120948
Change-Id: I33a93fa6c067d15a9739ca33703e0e48e8cf6eff
 2015-10-22 15:54:02 +01:00
Michael Wright
874ce44a80 Merge "Add new Cut / Copy / Paste keys." 2015-10-22 14:47:33 +00:00
Esteban Talavera
b32f8a2b53 Merge "Only system can set app restrictions" 2015-10-22 10:27:10 +00:00
Yoshiki Iguchi
e0ee5d9657 Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 am: 6649ee972b am: 6a5bb1534c 
am: fb8343549a

* commit 'fb8343549a65bf65dab0fce6830b1b39ce62ddaa':
  Fix crash on calling removeSelection with showing selection handlers
 2015-10-22 07:53:41 +00:00
Yoshiki Iguchi
fb8343549a Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 am: 6649ee972b 
am: 6a5bb1534c

* commit '6a5bb1534c736c21260c5c488ff58e4d81972f92':
  Fix crash on calling removeSelection with showing selection handlers
 2015-10-22 07:49:00 +00:00
Yoshiki Iguchi
6a5bb1534c Fix crash on calling removeSelection with showing selection handlers am: 9582e15196 
am: 6649ee972b

* commit '6649ee972b2bfbeca2d664cfd6629810ebbc7ac8':
  Fix crash on calling removeSelection with showing selection handlers
 2015-10-22 07:44:15 +00:00
Yoshiki Iguchi
6649ee972b Fix crash on calling removeSelection with showing selection handlers 
am: 9582e15196

* commit '9582e151964be60457d4abd712857fb1e8a4586d':
  Fix crash on calling removeSelection with showing selection handlers
 2015-10-22 07:39:17 +00:00
Yoshiki Iguchi
9582e15196 Fix crash on calling removeSelection with showing selection handlers 
A crash occured on updating after calling removeSelection with showing
selection handlers. This was because some selection-handler code didn't
consider the case the selection index was -1 (-1 means there is no selection).
This patch fixes this crash.

Bug: 23299977
Change-Id: I736d315e073f773aec597522203015205a8da42b
 2015-10-22 07:28:47 +00:00
Lorenzo Colitti
67fb3d7358 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 am: bdc458048a am: bb8f652372 
am: 8ecad265b6

* commit '8ecad265b6db57f78dd142e974057c91f69489ed':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
 2015-10-22 06:33:09 +00:00
Lorenzo Colitti
8ecad265b6 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 am: bdc458048a 
am: bb8f652372

* commit 'bb8f652372f261edd2083103d4300a9173993706':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
 2015-10-22 06:28:24 +00:00
Lorenzo Colitti
bb8f652372 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev am: 809dcade99 
am: bdc458048a

* commit 'bdc458048abee78a945a26cd13a71245e7d4a2e5':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
 2015-10-22 06:23:23 +00:00
Lorenzo Colitti
bdc458048a Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev 
am: 809dcade99

* commit '809dcade9906001f6aa51a68aa783e20bb1d7c0d':
  Reinstate CHANGE_NETWORK_STATE as a normal permission.
 2015-10-22 06:18:43 +00:00
Lorenzo Colitti
809dcade99 Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-dev 2015-10-22 06:15:05 +00:00
Nathan Harold
d470bb7dfc Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am: 0dccd12800 am: 64e8bdc476 am: 51692ac260 
am: 6f39642389

* commit '6f39642389d2702125898c401ca9e8881a322fe0':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 05:39:02 +00:00
Nathan Harold
6f39642389 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am: 0dccd12800 am: 64e8bdc476 
am: 51692ac260

* commit '51692ac260f8acc405ba94e9e83294bb1ef20015':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 05:33:10 +00:00
Nathan Harold
51692ac260 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() am: 0dccd12800 
am: 64e8bdc476

* commit '64e8bdc4760aebf7f8c80ce3384120ed9b01a3ec':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 05:28:26 +00:00
Nathan Harold
64e8bdc476 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() 
am: 0dccd12800

* commit '0dccd128001ceff9437f736bd70dfd1986e315d5':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 05:23:34 +00:00
Nathan Harold
0dccd12800 Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo() 
-Fixed doc string

Bug: 23979591

This reverts commit f7b6474de87fd2eee377dc612c757102cdacc003.

Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
 2015-10-21 20:35:46 -07:00
Nathan Harold
869a4e4cac Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 am: 5be7dbc88d am: b129c106bd 
am: ce73642a58

* commit 'ce73642a5804a50468fa9bc928333653948c5549':
  Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
 2015-10-22 03:13:02 +00:00
Nathan Harold
ce73642a58 Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 am: 5be7dbc88d 
am: b129c106bd

* commit 'b129c106bde86b8b290cc25cc39f0fcb9b9b48fb':
  Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
 2015-10-22 03:07:57 +00:00
Nathan Harold
b129c106bd Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev am: 42015c4081 
am: 5be7dbc88d

* commit '5be7dbc88d0460dfede5373f1204f4645ce99726':
  Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
 2015-10-22 03:03:18 +00:00
Nathan Harold
5be7dbc88d Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev 
am: 42015c4081

* commit '42015c4081f9d37d579f0be15e11725cf6cc5fba':
  Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"
 2015-10-22 02:58:15 +00:00
Nathan Harold
42015c4081 Merge "Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()"" into mnc-dr-dev 2015-10-22 02:54:45 +00:00
Nathan Harold
f7b6474de8 Revert "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" 
This reverts commit 5d1429e0dd1a13f76dbb354f9e4e415f71956299.

Doc string isn't resolving. Temporarily reverting.

Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e
 2015-10-22 02:53:57 +00:00
Daichi Hirono
d391813b70 Merge "Support major format code in MtpDocumentsProvider." 2015-10-22 02:23:39 +00:00
Nathan Harold
d66bb15f1a Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f am: dc9f8fab0f am: 1a3c88a5bf 
am: c3a94cb6c2

* commit 'c3a94cb6c2097ae2b30500a32ecf95b5714bd8c2':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 02:18:46 +00:00
Nathan Harold
c3a94cb6c2 Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f am: dc9f8fab0f 
am: 1a3c88a5bf

* commit '1a3c88a5bf8c80d46958830bb6282463c72a4e6b':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 02:13:54 +00:00
Nathan Harold
1a3c88a5bf Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev am: f8a4dc4a6f 
am: dc9f8fab0f

* commit 'dc9f8fab0fd9485b22651fe5c7f70961d67d697a':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 02:08:56 +00:00
Nathan Harold
dc9f8fab0f Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev 
am: f8a4dc4a6f

* commit 'f8a4dc4a6f8383fc2999ce1292d900912a0da842':
  Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()
 2015-10-22 02:03:32 +00:00
Nathan Harold
f8a4dc4a6f Merge "Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()" into mnc-dr-dev 2015-10-22 01:58:37 +00:00
Chris Craik
6fe991e5e7 Work to support saveLayer in new pipeline 
clipped SaveLayers will now be pulled to the beginning of the frame,
prior to drawing FBO 0. This will remove the need for switching FBOs
mid-frame.

Change-Id: I4d8dc1f845e84e9b49d5acdf4f4703eef4a9cb06
 2015-10-21 18:19:37 -07:00
Chong Zhang
fdcc4d4235 Assign different oom score to visible apps based on layer ordering. 
Pass oom score in kernel's full range [-1000,1000] to lmkd directly

bug: 21411311

Change-Id: I0cab2aa46269a716ea613025d3b84fe7d04404bb
 2015-10-21 18:16:19 -07:00
Adrian Roos
387d1b25b5 Merge "Track ashmem memory usage in Parcel" into mnc-dr-dev am: 33e1d376eb am: 655c12edb0 am: fda65d780e 
am: b531762c89

* commit 'b531762c89e45b9ac5c401a2e90f9330bcdf629e':
  Track ashmem memory usage in Parcel
 2015-10-22 01:10:15 +00:00