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

212657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miao Wang
b60105d041 Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements." am: 773756eeed 
am: 84d6e555f3

* commit '84d6e555f33d7d5f6383525d036ef21a5d166b31':
  [RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements.
 2015-10-23 17:14:17 +00:00
Miao Wang
84d6e555f3 Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements." 
am: 773756eeed

* commit '773756eeed21f67fa7f7eabc663df46c789129aa':
  [RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements.
 2015-10-23 17:05:12 +00:00
Miao Wang
773756eeed Merge "[RenderScript] Add null check for return values of JNI Get<TYPE>ArrayElements." 2015-10-23 17:00:31 +00:00
Andreas Gampe
b61fd4fae2 Merge "Revert "libs: add libpackagelistparser"" am: e3da6ba5dd 
am: 314e1e00d8

* commit '314e1e00d812e4edf426a46726a2127c563048a5':
  Revert "libs: add libpackagelistparser"
 2015-10-23 04:24:05 +00:00
Andreas Gampe
314e1e00d8 Merge "Revert "libs: add libpackagelistparser"" 
am: e3da6ba5dd

* commit 'e3da6ba5dd29002789a76dafdc14987c51d92ea5':
  Revert "libs: add libpackagelistparser"
 2015-10-23 04:16:20 +00:00
Andreas Gampe
e3da6ba5dd Merge "Revert "libs: add libpackagelistparser"" 2015-10-23 03:46:40 +00:00
Sungmin Choi
9bd6b23111 Remove tether_apndata for Sasktel am: a665ea7207 am: af745653d0 
am: b932dc5253

* commit 'b932dc5253fa27ec54e7aeeba12307adb3965df3':
  Remove tether_apndata for Sasktel
 2015-10-23 03:38:20 +00:00
Sungmin Choi
b932dc5253 Remove tether_apndata for Sasktel am: a665ea7207 
am: af745653d0

* commit 'af745653d0809d7f9545cebf8727ea8c75990fd1':
  Remove tether_apndata for Sasktel
 2015-10-23 03:33:29 +00:00
Sungmin Choi
af745653d0 Remove tether_apndata for Sasktel 
am: a665ea7207

* commit 'a665ea72075dbaa5a86f866ee6c8df5a80f1ced3':
  Remove tether_apndata for Sasktel
 2015-10-23 03:26:18 +00:00
Andreas Gampe
ce969123b1 Revert "libs: add libpackagelistparser" 
This reverts commit dc06bb0752c1bc3e87b04a097b308bca1bc86181.

This should go into system/core.

Change-Id: Idf304ac5ccd4bcc86722f65688e3ee6284452287
 2015-10-22 19:50:09 -07:00
Sungmin Choi
a665ea7207 Remove tether_apndata for Sasktel 
Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data.
SaskTel has moved to a single APN on devices (pda.stm.sk.ca).

BUG=25064017
Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296
 2015-10-22 16:59:44 -07:00
Daniel Cashman
a2dbc1cea3 Merge "libs: add libpackagelistparser" am: cc7373eafd 
am: 188e8875db

* commit '188e8875db1a55a6bafc8e8ef741400baab6e6fb':
  libs: add libpackagelistparser
 2015-10-22 23:38:40 +00:00
Daniel Cashman
188e8875db Merge "libs: add libpackagelistparser" 
am: cc7373eafd

* commit 'cc7373eafd0d5be7df8898748a700b47298ebf10':
  libs: add libpackagelistparser
 2015-10-22 23:12:49 +00:00
Daniel Cashman
cc7373eafd Merge "libs: add libpackagelistparser" 2015-10-22 23:03:51 +00:00
Ian Pedowitz
d3511518f9 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 am: b402735fc0 
am: 07129d53b5

* commit '07129d53b5380ec556fa14c7506a26b6776e629a':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:46:06 +00:00
Ian Pedowitz
07129d53b5 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev am: 09fd4ecf90 
am: b402735fc0

* commit 'b402735fc0eb246233814bce76118fba99bb9f87':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:38:56 +00:00
Ian Pedowitz
b402735fc0 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev 
am: 09fd4ecf90

* commit '09fd4ecf90c7ae2536a6848e8c88c4878e0e0c24':
  Revert "Track ashmem memory usage in Parcel"
 2015-10-22 22:32:37 +00:00
Ian Pedowitz
09fd4ecf90 Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-dev 2015-10-22 22:26:32 +00:00
Ian Pedowitz
e2adb2cf0f Revert "Track ashmem memory usage in Parcel" 
This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
 2015-10-22 22:09:04 +00:00
Nicolas Prévot
e1be56cdff Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am: 6666b29cf7 am: f31628f58b 
am: d7688f5933

* commit 'd7688f593327929e2bc42989236b62ddecf5e8b5':
  Don't resolve cross-profile app links without intent picker.
 2015-10-22 20:49:46 +00:00
Nicolas Prévot
d7688f5933 Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev am: 6666b29cf7 
am: f31628f58b

* commit 'f31628f58b97f99133b760b4c34d2ff6f4e456d0':
  Don't resolve cross-profile app links without intent picker.
 2015-10-22 20:43:32 +00:00
Nicolas Prévot
f31628f58b Merge "Don\'t resolve cross-profile app links without intent picker." into mnc-dr-dev 
am: 6666b29cf7

* commit '6666b29cf7c5ddaeae3d66606a9982f7c5cc8686':
  Don't resolve cross-profile app links without intent picker.
 2015-10-22 20:35:19 +00:00
Nicolas Prévot
6666b29cf7 Merge "Don't resolve cross-profile app links without intent picker." into mnc-dr-dev 2015-10-22 20:29:51 +00:00
Dmitry Torokhov
3eba93f21c SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f am: d3eee7c410 
am: 5c6a3872cb

* commit '5c6a3872cb0df50e9a8d2aaa0b8f84e78cd4433f':
  SystemUI: fix automatic pairing of BT keyboards
 2015-10-22 18:24:35 +00:00
Dmitry Torokhov
5c6a3872cb SystemUI: fix automatic pairing of BT keyboards am: 79f00cf06f 
am: d3eee7c410

* commit 'd3eee7c410dbc6f8eb5133a347fb0a0ce7221893':
  SystemUI: fix automatic pairing of BT keyboards
 2015-10-22 18:18:46 +00:00
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
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
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
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
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
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
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
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