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

156456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quddus Chong
f8cdc97843 am b14e07e3: am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 
* commit 'b14e07e34428e64d9a9525ea0322aa161b05efe6':
  docs: Updates to Android 5.0 API Overview.
 2014-10-17 18:59:16 +00:00
Quddus Chong
b14e07e344 am 0fae717e: am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 
* commit '0fae717e207d18a36148c7ddb4a203d4f7447bf7':
  docs: Updates to Android 5.0 API Overview.
 2014-10-17 18:51:18 +00:00
Alan Viverette
15d3a53be5 am 721fc2ad: Fix build 
* commit '721fc2adf4d4d5b890b12cb2067db10e78888aba':
  Fix build
 2014-10-17 18:50:41 +00:00
Alan Viverette
721fc2adf4 Fix build 
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
 2014-10-17 11:36:38 -07:00
Alan Viverette
0087f2253a am 2f68a204: Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 
* commit '2f68a204b2299029dd492ab25bd3bcfe7216bafc':
  Check type resolution on declared methods and fields in ViewDebug
 2014-10-17 17:23:20 +00:00
Alan Viverette
2f68a204b2 Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev 2014-10-17 17:18:36 +00:00
Dianne Hackborn
56ae044791 am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev 
* commit '686a41ef2b05b3fb1c5c5f44ec6270ab317ce9d5':
  Add API level for MR1.
 2014-10-17 17:15:29 +00:00
Dianne Hackborn
686a41ef2b Merge "Add API level for MR1." into lmp-mr1-dev 2014-10-17 17:12:01 +00:00
John Spurlock
cd9ec79b10 am 6daac003: Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 
* commit '6daac00331fa79d8ab249ef148a8116e58ca9a56':
  PowerUI: Uncategorize battery notifications as _SYSTEM.
 2014-10-17 16:43:42 +00:00
John Spurlock
6daac00331 Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 2014-10-17 16:39:21 +00:00
John Spurlock
0f0ee577f6 am 289d797a: QS: 7 day timeout for color-inversion tile. 
* commit '289d797a6a748cfc7dcca8c815fab6c37061bf05':
  QS: 7 day timeout for color-inversion tile.
 2014-10-17 16:20:48 +00:00
John Spurlock
5b038b4b2b PowerUI: Uncategorize battery notifications as _SYSTEM. 
So they don't interrupt in priority mode.

Bug: 17691121
Change-Id: I51757c0275ec461a786d1e254b0e71f7b27b5029
 2014-10-17 12:16:57 -04:00
John Spurlock
289d797a6a QS: 7 day timeout for color-inversion tile. 
Bug: 17631628
Change-Id: I4f8a6ce3ea1f79d696686760732c3e8216bfb6c4
 2014-10-17 12:06:38 -04:00
Quddus Chong
0fae717e20 am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 
* commit '67b5c8ebc4a9895e065a9314cb9afbf8e3e60197':
  docs: Updates to Android 5.0 API Overview.
 2014-10-17 07:28:41 +00:00
Dianne Hackborn
3b6968876f Add API level for MR1. 
Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
 2014-10-16 18:14:12 -07:00
Nancy Chen
28bfe49e8f am a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev 
automerge: df385ff

* commit 'df385fffe822a7854fb7ce9c5e46ee007646c89e':
  Use Telecom API for checking if a number is voicemail (1/2)
 2014-10-17 00:43:13 +00:00
Christopher Tate
ed1e999cb7 am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 
automerge: 11bac0e

* commit '11bac0ed21e67c2282ae6fff38ed026e904571d4':
  Eliminate race condition around backup completion + resumption
 2014-10-17 00:41:31 +00:00
Nancy Chen
96c6213e44 am c913c2de: Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev 
automerge: 6f0c3f1

* commit '6f0c3f1a9a0a7a72c560e756504541e5fa8ac584':
  Revert "Add API method to extract subscription ID from phone account (1/3)"
 2014-10-17 00:39:51 +00:00
Quddus Chong
67b5c8ebc4 Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 2014-10-17 00:39:31 +00:00
Andrew Solovay
b995dbcbb3 am 8150734f: am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev 
automerge: f029a41

* commit 'f029a419189954beccd8cddd4f9fb48aa79ae51e':
  docs: Updating support library pages for v.21.
 2014-10-17 00:38:47 +00:00
Andrew Solovay
b658608bae am 32b459e5: am 4461e926: Merge "docs: Restored the preview license." into lmp-dev 
automerge: f1816c2

* commit 'f1816c2bc7ba64055c56805dc47036cc261921f5':
  docs: Restored the preview license.
 2014-10-17 00:37:39 +00:00
Nancy Chen
df385fffe8 am a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev 
* commit 'a6a1c52f58f24194de2665bb922577a9d7f6dccf':
  Use Telecom API for checking if a number is voicemail (1/2)
 2014-10-17 00:05:36 +00:00
Christopher Tate
11bac0ed21 am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 
* commit '61737d81a2e0a2cc327210bf771239655f62c3d9':
  Eliminate race condition around backup completion + resumption
 2014-10-17 00:05:22 +00:00
Nancy Chen
6f0c3f1a9a am c913c2de: Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev 
* commit 'c913c2dec18519ae5b989f65b207c7b3fec2d0ef':
  Revert "Add API method to extract subscription ID from phone account (1/3)"
 2014-10-17 00:05:14 +00:00
Andrew Solovay
f029a41918 am 8150734f: am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev 
* commit '8150734faa7feb8547f369db949c1149663ae2ee':
  docs: Updating support library pages for v.21.
 2014-10-17 00:05:10 +00:00
Andrew Solovay
f1816c2bc7 am 32b459e5: am 4461e926: Merge "docs: Restored the preview license." into lmp-dev 
* commit '32b459e5c56cd1ccb0c9bb15336f796cb75e75f0':
  docs: Restored the preview license.
 2014-10-17 00:05:06 +00:00
Alan Viverette
e0fceba162 Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev 
automerge: 0db6536

* commit '0db6536190fa34910c0bfe376c47b8d594f32a25':
  Update AM/PM selectors for clock face TimePicker
 2014-10-17 00:00:30 +00:00
Alan Viverette
0db6536190 Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev 2014-10-16 23:48:38 +00:00
xinhe
094c313669 Merge "telephony re-registry error" into lmp-mr1-dev 
automerge: efdddef

* commit 'efdddefaf5932f81b16aa49a2394f9b3d4e48bf5':
  telephony re-registry error
 2014-10-16 23:32:11 +00:00
xinhe
efdddefaf5 Merge "telephony re-registry error" into lmp-mr1-dev 2014-10-16 22:37:45 +00:00
Nancy Chen
a6a1c52f58 Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev 2014-10-16 22:00:29 +00:00
xinhe
75c2c159eb telephony re-registry error 
telephony re-registry do not update the callback and other parameter

Bug:17920733

Change-Id: I288e8b9a6747fc3c5c4794553435b29b49d379f0
 2014-10-16 21:54:38 +00:00
Nancy Chen
443e501c46 Use Telecom API for checking if a number is voicemail (1/2) 
Since we don't want to communicate directly with Telephony in dialer, call
PhoneNumberUtils.isVoiceMailNumber (a Telephony method) through the
Telecom API. Add a method in TelecomManager to do this.

Bug: 17925501

Change-Id: Iecea82a0e5f0b106eaf105e9026d606110acf122
 2014-10-16 14:48:09 -07:00
Christopher Tate
61737d81a2 am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 
* commit '040d89bb0a4563d93073b7a27b3f201ce11dcf58':
  Eliminate race condition around backup completion + resumption
 2014-10-16 21:30:39 +00:00
Christopher Tate
040d89bb0a Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 2014-10-16 21:26:26 +00:00
Nancy Chen
c913c2dec1 Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev 2014-10-16 21:17:03 +00:00
Andrew Solovay
8150734faa am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev 
* commit '6b53fb6227b884db2761fa146ed2f4f28100962d':
  docs: Updating support library pages for v.21.
 2014-10-16 21:14:56 +00:00
Chenjie Luo
67b086f9f1 am b08ee9b7: am 76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit 'b08ee9b728347abf67ee193981b84db54810538b':
  Add system property config.disable_networktime to configure NetworkTimeUpdateService
 2014-10-16 21:12:10 +00:00
Andrew Solovay
6b53fb6227 Merge "docs: Updating support library pages for v.21." into lmp-dev 2014-10-16 21:10:20 +00:00
Andrew Solovay
32b459e5c5 am 4461e926: Merge "docs: Restored the preview license." into lmp-dev 
* commit '4461e9268ba010f9cd6e8881a57b7af7b031ea31':
  docs: Restored the preview license.
 2014-10-16 21:09:57 +00:00
Nancy Chen
af6732ef6f Revert "Add API method to extract subscription ID from phone account (1/3)" 
This reverts commit b0cad32c3cadd0387f6dcd82aade629e6f2f6bee.

Change-Id: I54b6373ba0fc7d1ecc64c6ceedc7b371c7017cd8
 2014-10-16 21:08:39 +00:00
Chenjie Luo
b08ee9b728 am 76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit '76ed803fbd3d7be015cc25f521b73a9436c14fdb':
  Add system property config.disable_networktime to configure NetworkTimeUpdateService
 2014-10-16 21:05:51 +00:00
Andrew Solovay
4461e9268b Merge "docs: Restored the preview license." into lmp-dev 2014-10-16 21:01:07 +00:00
Chenjie Luo
76ed803fbd Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev 2014-10-16 20:57:56 +00:00
Andrew Solovay
347257a74d docs: Restored the preview license. 
Added the preview license back, with changes as previously negotiated
with legal.

See first comment for staging directory link.

Change-Id: Ibc23d4d89b4380546d61ed052ba15dc81b8b1336
 2014-10-16 13:57:20 -07:00
Christopher Tate
a28b5c5160 Eliminate race condition around backup completion + resumption 
Ensure that the callback always sees the current-operation state in sync
with the various other bits of internal backup-operation state.  Previously
only the current-operation state was managed inside the critical section;
this resulted in a slim race window where a callback could see an ongoing
operation as still valid, but after the internal state on which that
operation depended had already been cleared.

Bug 17931760

Change-Id: Ia032668e7a9d22f1029c57fc98db9e86484d5719
 2014-10-16 13:56:45 -07:00
Rich Slogar
fbe9a6affc am 18535b07: am 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit '18535b07a8a8e244f89ccce8c07226c24055c748':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 20:55:03 +00:00
Rich Slogar
18535b07a8 am 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit '68c537f1981970f0ccac0fe46d5c522d5e05a82c':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 20:49:53 +00:00
Rich Slogar
68c537f198 am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit '60e74b4924dee6d033ca61854cac42768006ced5':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 20:45:31 +00:00
Rich Slogar
60e74b4924 Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 2014-10-16 20:41:18 +00:00