Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
242,245 Commits 3 Branches 0 Tags
e6612ea48bb14ab93c249e2f59cd8e80347546a3
Commit Graph

242245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
e6612ea48b Fix null pointer exception am: 14810c7 
am: 00217cd

* commit '00217cddcd1d3a0681214fe9d629f61dbfb5d9e6':
  Fix null pointer exception
 2016-03-28 21:17:11 +00:00
Tao Bao
c0d4b37a16 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev am: 9971d02 
am: 85b0ba3

* commit '85b0ba3cc369cc5106a5368434524ae479dfa00d':
  UpdateEngine: Add resetStatus() as system API.
 2016-03-28 21:17:04 +00:00
Paul McLean
1463cab5a1 Merge "Added logging to USB Audio connect and disconnect." into nyc-dev am: 2d63f1a 
am: 68c6f4c

* commit '68c6f4c61d7ec9c2eb8b540fd1a852fba1bcc194':
  Added logging to USB Audio connect and disconnect.
 2016-03-28 21:16:54 +00:00
Makoto Onuki
e67f4c7ad3 Merge "ShortcutManager: Cleanup package info handling" into nyc-dev am: 7b71a6f 
am: 8de4c90

* commit '8de4c909579fecba9f2662d8598dc124c6caabfd':
  ShortcutManager: Cleanup package info handling
 2016-03-28 21:16:44 +00:00
Andrii Kulian
0b7964bdba Merge "Fix API numbering issues" into nyc-dev am: 162c9d04 
am: b4da6e3

* commit 'b4da6e3d99be85efdd431bd6dfefcade43d27ac5':
  Fix API numbering issues
 2016-03-28 21:16:29 +00:00
Brad Ebinger
7fde28455a Merge "Add VIA number column to CallLog Database" into nyc-dev am: 900f163 
am: ca3c301

* commit 'ca3c3012df230e0c49906e18fdea93992d6313b2':
  Add VIA number column to CallLog Database
 2016-03-28 21:16:01 +00:00
Chad Brubaker
8a549ff056 Merge "Use X509ExtendedTrustManagers" into nyc-dev am: 12da920 
am: 71ea966

* commit '71ea9666d80bed95d1c2bfff6e063db03a78e23b':
  Use X509ExtendedTrustManagers
 2016-03-28 21:14:58 +00:00
Yigit Boyar
41b29bd32d Merge "Recover focus on size change in ListView" into nyc-dev am: e082735 
am: e46e7fb

* commit 'e46e7fbde9bd6c16efc1a2fdee554b73afa7d124':
  Recover focus on size change in ListView
 2016-03-28 21:14:16 +00:00
Mitchell Wills
6fe50d203e Merge "Add accessor for buckets scanned in ScanData" into nyc-dev am: 396884c 
am: e129dff

* commit 'e129dff3c49e3903431c5f46602f7eb079d6ad09':
  Add accessor for buckets scanned in ScanData
 2016-03-28 21:14:01 +00:00
Chris Craik
df55ced813 Merge "Consume TextureView matrix safely" into nyc-dev am: 3839ab1 
am: 2841963

* commit '2841963e51c7d75e27b57b7c29824df5c5b45da3':
  Consume TextureView matrix safely
 2016-03-28 21:13:42 +00:00
Lifu Tang
9c33c073cd Merge "Added missing constants to GnssMeasurement" into nyc-dev am: a89a392 
am: 46d2e76

* commit '46d2e7673cd70797f0b1521bbf1aedc9adffe830':
  Added missing constants to GnssMeasurement
 2016-03-28 21:13:22 +00:00
Yohei Yukawa
4c5d6e5eb7 Merge "Dump more info for View when IMM#DEBUG is true." into nyc-dev am: feade80 
am: ab0dbb1

* commit 'ab0dbb1d53a4b85098129beae034a6515f8dc935':
  Dump more info for View when IMM#DEBUG is true.
 2016-03-28 21:13:01 +00:00
Yohei Yukawa
a6e08639cc Merge "Clean-up a workaround that is no longer necessary." into nyc-dev am: 207d325 
am: 34b4ff2

* commit '34b4ff24a052c92cb8425d5a251874c9b285e99e':
  Clean-up a workaround that is no longer necessary.
 2016-03-28 21:12:32 +00:00
Chris Craik
c70cc529ff Merge "Add a couple more tests around bitmap uploads" into nyc-dev am: aab289b 
am: 17bf838

* commit '17bf83846203a39b8a02e459470274ff94bd21f7':
  Add a couple more tests around bitmap uploads
 2016-03-28 21:11:28 +00:00
Eino-Ville Talvala
2c72580d2c Merge "Camera: Add bandaid for preview orientation on reverse-landscape cameras" into nyc-dev am: 8c349f5 
am: 6da63cf

* commit '6da63cfb19be997671419fe8773d1f8f0ddd67d5':
  Camera: Add bandaid for preview orientation on reverse-landscape cameras
 2016-03-28 21:10:15 +00:00
Jorim Jaggi
00217cddcd Fix null pointer exception 
am: 14810c7

* commit '14810c7e3e5c8153183e36a819779cff4a979c89':
  Fix null pointer exception
 2016-03-28 21:05:41 +00:00
Tao Bao
85b0ba3cc3 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev 
am: 9971d02

* commit '9971d02c38151a4289552d5b1cfb7b3c7c0acec6':
  UpdateEngine: Add resetStatus() as system API.
 2016-03-28 21:05:36 +00:00
Paul McLean
68c6f4c61d Merge "Added logging to USB Audio connect and disconnect." into nyc-dev 
am: 2d63f1a

* commit '2d63f1a946019753da0f8d077051beb7bc8b85d4':
  Added logging to USB Audio connect and disconnect.
 2016-03-28 21:05:31 +00:00
Makoto Onuki
8de4c90957 Merge "ShortcutManager: Cleanup package info handling" into nyc-dev 
am: 7b71a6f

* commit '7b71a6f622fcad9d2c5b2788133330693ab2655c':
  ShortcutManager: Cleanup package info handling
 2016-03-28 21:05:25 +00:00
Andrii Kulian
b4da6e3d99 Merge "Fix API numbering issues" into nyc-dev 
am: 162c9d04

* commit '162c9d0425bfed7df598f9f094239ec10e1438bb':
  Fix API numbering issues
 2016-03-28 21:05:19 +00:00
Brad Ebinger
ca3c3012df Merge "Add VIA number column to CallLog Database" into nyc-dev 
am: 900f163

* commit '900f1635c021b022243049e2401ef04ad554465f':
  Add VIA number column to CallLog Database
 2016-03-28 21:05:11 +00:00
Chad Brubaker
71ea9666d8 Merge "Use X509ExtendedTrustManagers" into nyc-dev 
am: 12da920

* commit '12da920fa41eef7b28b14b4ae9af06212c77da4b':
  Use X509ExtendedTrustManagers
 2016-03-28 21:05:04 +00:00
Yigit Boyar
e46e7fbde9 Merge "Recover focus on size change in ListView" into nyc-dev 
am: e082735

* commit 'e0827355a5ca89188ed16f6df7db930aa964be4f':
  Recover focus on size change in ListView
 2016-03-28 21:04:56 +00:00
Mitchell Wills
e129dff3c4 Merge "Add accessor for buckets scanned in ScanData" into nyc-dev 
am: 396884c

* commit '396884ca84672f746b627fef27121e578fe9262e':
  Add accessor for buckets scanned in ScanData
 2016-03-28 21:04:45 +00:00
Chris Craik
2841963e51 Merge "Consume TextureView matrix safely" into nyc-dev 
am: 3839ab1

* commit '3839ab1e3eabbceeccfc0be25fbd15512138fab7':
  Consume TextureView matrix safely
 2016-03-28 21:04:31 +00:00
Lifu Tang
46d2e7673c Merge "Added missing constants to GnssMeasurement" into nyc-dev 
am: a89a392

* commit 'a89a392aef5ca24093d54e005e58c18f206cd5f6':
  Added missing constants to GnssMeasurement
 2016-03-28 21:04:11 +00:00
Yohei Yukawa
ab0dbb1d53 Merge "Dump more info for View when IMM#DEBUG is true." into nyc-dev 
am: feade80

* commit 'feade806098a0fe6bc53e1a531dedb6af13fac57':
  Dump more info for View when IMM#DEBUG is true.
 2016-03-28 21:03:43 +00:00
Yohei Yukawa
34b4ff24a0 Merge "Clean-up a workaround that is no longer necessary." into nyc-dev 
am: 207d325

* commit '207d325c52b94f61a4ad645597fe88ef7374708d':
  Clean-up a workaround that is no longer necessary.
 2016-03-28 21:03:11 +00:00
Chris Craik
17bf838462 Merge "Add a couple more tests around bitmap uploads" into nyc-dev 
am: aab289b

* commit 'aab289b8c2f1e8c763972bad93465022eb6846a6':
  Add a couple more tests around bitmap uploads
 2016-03-28 21:02:46 +00:00
Eino-Ville Talvala
6da63cfb19 Merge "Camera: Add bandaid for preview orientation on reverse-landscape cameras" into nyc-dev 
am: 8c349f5

* commit '8c349f5d3b764d4ab726070dba397a2a292a6858':
  Camera: Add bandaid for preview orientation on reverse-landscape cameras
 2016-03-28 21:02:27 +00:00
Jorim Jaggi
14810c7e3e Fix null pointer exception 
- Make sure to use the correct task to get the stack.
- Don't try to show non-resizable toast when we didn't do
anything.

Bug: 27870378
Change-Id: I69fec6aa792c2f05d905a7c99c05ebdc689ad032
 2016-03-28 19:55:32 +00:00
Tao Bao
9971d02c38 Merge "UpdateEngine: Add resetStatus() as system API." into nyc-dev 2016-03-28 19:51:36 +00:00
Paul Mclean
2d63f1a946 Merge "Added logging to USB Audio connect and disconnect." into nyc-dev 2016-03-28 19:49:15 +00:00
Makoto Onuki
7b71a6f622 Merge "ShortcutManager: Cleanup package info handling" into nyc-dev 2016-03-28 19:34:07 +00:00
Andrii Kulian
162c9d0425 Merge "Fix API numbering issues" into nyc-dev 2016-03-28 19:28:23 +00:00
Brad Ebinger
900f1635c0 Merge "Add VIA number column to CallLog Database" into nyc-dev 2016-03-28 19:27:20 +00:00
Daniel Nishi
edf32079ea Merge "Add a branded VPN icon for quick settings and status bar." 2016-03-28 19:27:06 +00:00
Chad Brubaker
12da920fa4 Merge "Use X509ExtendedTrustManagers" into nyc-dev 2016-03-28 19:14:23 +00:00
Yigit Boyar
e0827355a5 Merge "Recover focus on size change in ListView" into nyc-dev 2016-03-28 19:10:08 +00:00
Paul McLean
c72239409b Added logging to USB Audio connect and disconnect. 
This will let us see in bug reports if the USB device in question
is ACTUALLY recognized and added/removed from the audio system.

Bug: 27812441

Change-Id: Id3eb4d4f3f0b1e66a24999706ba589c0962eba58
 2016-03-28 13:07:09 -06:00
Mitchell Wills
396884ca84 Merge "Add accessor for buckets scanned in ScanData" into nyc-dev 2016-03-28 18:41:03 +00:00
Chris Craik
3839ab1e3e Merge "Consume TextureView matrix safely" into nyc-dev 2016-03-28 18:30:22 +00:00
Lifu Tang
a89a392aef Merge "Added missing constants to GnssMeasurement" into nyc-dev 2016-03-28 18:22:28 +00:00
Yohei Yukawa
feade80609 Merge "Dump more info for View when IMM#DEBUG is true." into nyc-dev 2016-03-28 18:20:56 +00:00
Andrii Kulian
ad462701a8 Fix API numbering issues 
This fixes issues with API numbering introduced in
2e751b8c77.

Original commit replaced 'minimalSize' resource with 'minimalWidth' and
'minimalHeight' and 'make update-api' shifted the numbering of other resources.
This change reverts the shift, reuses number of 'minimalSize' and adds
another one new.

Bug: 27528326
Change-Id: I7d327f00043c2bd2aab7285e03223a042e8c97a3
 2016-03-28 11:16:31 -07:00
Daniel Nishi
3956639122 Add a branded VPN icon for quick settings and status bar. 
If a system VPN app specifies in its meta-data that it should use the system's
branded VPN icon instead of the standard one, the Quick Settings footer and
status bar show it instead.

Bug 27146125

Change-Id: I3cfe4dda156d9147bdb339ba6bce82c72ca7393d
 2016-03-28 11:02:41 -07:00
Ben Wagner
bd9595dfa2 Replace SkCanvas::drawText with SkCanvas::drawPosText. 
Change-Id: I2b9f00970f85b39432f2377e89d0bb2670282ec4
 2016-03-28 17:56:51 +00:00
Yohei Yukawa
207d325c52 Merge "Clean-up a workaround that is no longer necessary." into nyc-dev 2016-03-28 17:55:26 +00:00
Chad Brubaker
0f5d386a76 Use X509ExtendedTrustManagers 
Move the X509TrustManagers for the Network Security Config from
X509TrustManagers to X509ExtendedTrustManagers.

Bug: 27271561
Change-Id: I084a6c6022fe69730192d2bdcbabaf58e8f92f04
 2016-03-28 10:48:41 -07:00
Chris Craik
aab289b8c2 Merge "Add a couple more tests around bitmap uploads" into nyc-dev 2016-03-28 17:47:52 +00:00