Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
5c98dde791 am 46c588b9: am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev 
* commit '46c588b9394128a2da2c0ce3cea4eef05cea0f12':
  docs: Android 5.1 API Release notes (Lollipop MR1)
 2015-03-03 01:16:52 +00:00
Joe Fernandez
be34916d44 am 45ef73b4: Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev 
* commit '45ef73b4e97a0621ba5f26eef280f6550c81338d':
  docs: Add Android 5.1 to the uses-sdk manifest docs
 2015-03-03 01:15:31 +00:00
Rich Slogar
2cbda290f6 am 69b58e74: Merge "docs: sdk tools 24.1 update" into lmp-docs 
* commit '69b58e74e087159ed5950632b4ab3738a841c633':
  docs: sdk tools 24.1 update
 2015-03-03 01:13:36 +00:00
Rich Slogar
69b58e74e0 Merge "docs: sdk tools 24.1 update" into lmp-docs 2015-03-03 01:07:44 +00:00
Joe Fernandez
46c588b939 am 5c6476aa: Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev 
* commit '5c6476aa507577422557d8434a7ce19937cfccfd':
  docs: Android 5.1 API Release notes (Lollipop MR1)
 2015-03-03 01:06:10 +00:00
Joe Fernandez
45ef73b4e9 Merge "docs: Add Android 5.1 to the uses-sdk manifest docs" into lmp-mr1-dev 2015-03-03 01:02:55 +00:00
Joe Fernandez
5c6476aa50 Merge "docs: Android 5.1 API Release notes (Lollipop MR1)" into lmp-mr1-dev 2015-03-03 00:56:43 +00:00
Joe Fernandez
2c25106ab4 docs: Add Android 5.1 to the uses-sdk manifest docs 
Change-Id: Idf9962af4250e68ed885571a57b9a51a40f74267
 2015-03-02 16:43:14 -08:00
Joe Fernandez
3d44c0faca docs: update Android docs build to include API 22, Android 5.1 
Change-Id: If41c1a142db0f2df439afaa9cf5d0fe0ca47d2c0
 2015-03-02 15:53:38 -08:00
Joe Fernandez
50d0953a86 docs: Android 5.1 API Release notes (Lollipop MR1) 
Change-Id: I47f59ade26086b8368d8b395f92992edc27510d0
 2015-03-02 15:35:07 -08:00
Shishir Agrawal
c8e3784e25 am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev 
* commit '20a5df6205c3d57bfcb5b8e1454fb88c638c8ae3':
  Fix incorrect condition for sub id check.
 2015-03-02 22:48:11 +00:00
Shishir Agrawal
20a5df6205 am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev 
* commit 'bcced5b834e49bf3a0b57a0009958ba061d31e76':
  Fix incorrect condition for sub id check.
 2015-03-02 22:38:43 +00:00
Shishir Agrawal
bcced5b834 Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev 2015-03-02 22:32:17 +00:00
Luan Nguyen
f46471e304 docs: Remove deprecated Fitness information from this doc. 
Guides have been moved to developers.google.com/fit

bug: 19387145
Change-Id: I6d14d2e643e68d923e135555e0b3c78060e22b8e
 2015-03-02 14:26:47 -08:00
Deepanshu Gupta
fb96187bb6 am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit '32dc37b72e787ca9323c01aa86e65694b6ff0cf7':
  Correct PorterDuff filters.
 2015-03-02 20:03:37 +00:00
Deepanshu Gupta
7c4ab9deaa am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit '4e87709b8b41a12d6caf2bd1110beed20e5b88e5':
  Fix codestyle for switch statements.
 2015-03-02 20:03:32 +00:00
Deepanshu Gupta
4a194d3b7f am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '6250030736e3ea25bacc92eba4c269dc6a6ee3db':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 20:03:28 +00:00
Deepanshu Gupta
32dc37b72e am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit 'f2c1c09683a5cfa23e8394fe5a10e84803f4168b':
  Correct PorterDuff filters.
 2015-03-02 19:56:27 +00:00
Deepanshu Gupta
4e87709b8b am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit '2022b0ffdd7c91e8435bc204ad9aedd658254166':
  Fix codestyle for switch statements.
 2015-03-02 19:56:24 +00:00
Deepanshu Gupta
6250030736 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit 'aff0ec93f2a734a68673f1f7337533b6d93cb256':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 19:56:18 +00:00
Deepanshu Gupta
f2c1c09683 am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863':
  Correct PorterDuff filters.
 2015-03-02 19:52:33 +00:00
Deepanshu Gupta
2022b0ffdd am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5':
  Fix codestyle for switch statements.
 2015-03-02 19:52:29 +00:00
Deepanshu Gupta
aff0ec93f2 am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '81449b2c4a63392bff22d77f331f4db52011884b':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 19:52:25 +00:00
Deepanshu Gupta
bf815f4952 am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev 
* commit '7b4caab1a87b659498d30af194ae511526c503ba':
  Add status bar time for 5.1
 2015-03-02 19:47:29 +00:00
Deepanshu Gupta
6ed9b75a45 am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71':
  Correct PorterDuff filters.
 2015-03-02 19:44:51 +00:00
Deepanshu Gupta
d003e81331 am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84':
  Fix codestyle for switch statements.
 2015-03-02 19:44:47 +00:00
Deepanshu Gupta
81449b2c4a am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '10d620ff2c4770e926b693e833105e8dbbd5fa86':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 19:44:43 +00:00
Deepanshu Gupta
7b4caab1a8 am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev 
* commit '07d453fa091ab407864d474f9bf2a5167686010a':
  Add status bar time for 5.1
 2015-03-02 19:41:59 +00:00
Deepanshu Gupta
72d75f8d9f Merge "Correct PorterDuff filters." into lmp-dev 2015-03-02 19:40:14 +00:00
Deepanshu Gupta
369ad57b00 Merge "Fix codestyle for switch statements." into lmp-dev 2015-03-02 19:37:32 +00:00
Deepanshu Gupta
10d620ff2c Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 2015-03-02 19:37:04 +00:00
Deepanshu Gupta
07d453fa09 Merge "Add status bar time for 5.1" into lmp-mr1-dev 2015-03-02 19:26:15 +00:00
Joe Fernandez
98a57a1ab8 am 4725bec1: am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit '4725bec1ff03d8be859c52dba6ac663016c2295c':
  docs: March 2015 Dashboard update
 2015-03-02 18:18:46 +00:00
Joe Fernandez
4725bec1ff am 8243b74f: am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit '8243b74f7f19d57455f7ff9188f539d0361139db':
  docs: March 2015 Dashboard update
 2015-03-02 18:10:54 +00:00
Joe Fernandez
8243b74f7f am 6a0c8084: am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit '6a0c808487392f6cd8d62ad4abb51c0f077ace0f':
  docs: March 2015 Dashboard update
 2015-03-02 18:04:39 +00:00
Joe Fernandez
6a0c808487 am 9b94a539: am 97a1173b: docs: March 2015 Dashboard update 
* commit '9b94a5399845efc9d52ebf37e8fde320885c07c8':
  docs: March 2015 Dashboard update
 2015-03-02 17:14:51 +00:00
Joe Fernandez
9b94a53998 am 97a1173b: docs: March 2015 Dashboard update 
* commit '97a1173b63be900ab5aed694e8022c60f3817fa0':
  docs: March 2015 Dashboard update
 2015-03-02 17:09:01 +00:00
Joe Fernandez
97a1173b63 docs: March 2015 Dashboard update 
Change-Id: Icaf390b6e55c216c45730190ab31bec7b746e361
 2015-03-02 09:00:55 -08:00
Geoff Mendal
e467992236 am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'fe78077418982794dc4b8966e3d389ce0f7ad13c':
  Import translations. DO NOT MERGE
 2015-03-02 14:22:52 +00:00
Geoff Mendal
fe78077418 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-02 14:18:15 +00:00
Geoff Mendal
b77346add0 am 6b5b052e: (-s ours) Import translations. DO NOT MERGE 
* commit '6b5b052ee6b75cee712215284923d2fcd17a7871':
  Import translations. DO NOT MERGE
 2015-03-02 14:16:57 +00:00
Geoff Mendal
341b04711d Import translations. DO NOT MERGE 
Change-Id: Icff770a9eb701279c5011e816970c69c58862174
Auto-generated-cl: translation import
 2015-03-02 06:15:22 -08:00
Geoff Mendal
6b5b052ee6 Import translations. DO NOT MERGE 
Change-Id: I7b517cbc545481e58ddc8afc769fc5f39d4fd1ad
Auto-generated-cl: translation import
 2015-03-02 06:09:28 -08:00
Geoff Mendal
3f27483fc0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-02 13:52:28 +00:00
Geoff Mendal
4d065f9d62 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-03-02 13:52:07 +00:00
Geoff Mendal
be9706dfb5 Import translations. DO NOT MERGE 
Change-Id: Ifd7882b235b226a5840595667429569125f1849f
Auto-generated-cl: translation import
 2015-03-02 07:48:34 -06:00
Geoff Mendal
20f4004368 Import translations. DO NOT MERGE 
Change-Id: I276c74627637383b8e9e132dcb41b597e7db1d54
Auto-generated-cl: translation import
 2015-03-02 05:48:19 -08:00
Geoff Mendal
c92894e61a Import translations. DO NOT MERGE 
Change-Id: I90f0e65ebcc2b70c492f9c1f726436f47c582a5d
Auto-generated-cl: translation import
 2015-03-02 05:42:09 -08:00
Bryce Lee
82ae149f5b Allow press and hold from non-interactive. 
Bug: 19520133
Change-Id: I3ad50f72499667e9b711057f381144a6c3ae6138
 2015-02-27 17:59:16 -08:00
Nick Vaccaro
f257469c08 Avoid unhandled page fault cases on Android Wear 
Telephony routines were dereferencing the null result of
getITelephony() and getSubscriberInfo(), causing unhandled page
faults at the hardware level.

Bug: 18264818
Change-Id: I7d058aa881c7dac20051d6faea2a6d52be4bd74e
 2015-02-27 15:31:09 -08:00