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

162473 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
792fd3d1ee am 2b52cad1: Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 
* commit '2b52cad12e371a173b61257599824934b1a6c930':
  Switch the connectivity check to its own hostname.
 2015-01-14 11:59:46 +00:00
Wink Saville
657f9a680f am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 
* commit '1a6dd2985ef1eab036f6fc77cf723e3f12832e93':
  StateMachine.dump produces no output sometimes.
 2015-01-14 11:59:41 +00:00
Lorenzo Colitti
2b52cad12e Merge "Switch the connectivity check to its own hostname." into lmp-mr1-dev 2015-01-14 10:28:26 +00:00
Wink Saville
1a6dd2985e Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev 2015-01-14 00:52:08 +00:00
Junda Liu
ead0184548 am 6e410196: Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 
* commit '6e41019633975358cf2f84c5d1e09e6e3a049875':
  Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council.
 2015-01-14 00:09:53 +00:00
Junda Liu
6e41019633 Merge "Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council." into lmp-mr1-dev 2015-01-14 00:06:19 +00:00
Justin Harrison
561cf95955 am 82008858: Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev 
* commit '820088587e732fe04b705248a06f275bf264be33':
  Fix unexpected language changes on SIM card insertion.
 2015-01-13 23:15:14 +00:00
Eric Laurent
50085fbccf am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev 
* commit 'ad58ca67c6e3a999357f0d4df8daa9fbbe1a2903':
  AudioService: handle stream mute by stream alias
 2015-01-13 23:15:09 +00:00
Stuart Scott
dfb99e8274 am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 
* commit 'e3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372':
  Update javadoc and hide getNameSource and getDataRoaming.
 2015-01-13 23:15:03 +00:00
Fyodor Kupolov
562e87bdd5 am 207d7bd3: Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev 
* commit '207d7bd3a4aca3478910ec740a0c810868fbeabb':
  Run isKeyguardSecure under system privileges
 2015-01-13 23:14:58 +00:00
Lorenzo Colitti
cd29cb66f9 Switch the connectivity check to its own hostname. 
Bug: 18467482
Bug: 18869302
Bug: 18924197
Change-Id: I1de478e9c8a165faf6f1bf81e042d1de9e03c3d5
 2015-01-14 08:06:56 +09:00
Justin Harrison
820088587e Merge "Fix unexpected language changes on SIM card insertion." into lmp-mr1-dev 2015-01-13 23:01:39 +00:00
Eric Laurent
ad58ca67c6 Merge "AudioService: handle stream mute by stream alias" into lmp-mr1-dev 2015-01-13 23:00:40 +00:00
Stuart Scott
e3b0449b0f Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev 2015-01-13 22:43:14 +00:00
Wink Saville
54b1b1a07a StateMachine.dump produces no output sometimes. 
If the content to dump is large no output is produced by dump. Change
back to using a loop and flush.

Bug: 18965342
Change-Id: Ibc33da8bfffd5f998a78df0e2d70ed8e8a0aa137
 2015-01-13 22:35:25 +00:00
Fyodor Kupolov
207d7bd3a4 Merge "Run isKeyguardSecure under system privileges" into lmp-mr1-dev 2015-01-13 22:19:26 +00:00
Junda Liu
3fb3abd10a Rename setGlobalPreferredNetworkType to setPreferredNetworkTypeToGlobal per API council. 
Bug: b/18983535
Change-Id: I937b7ce38615e07f653d3ee02d734edfcfea3897
 2015-01-13 14:11:11 -08:00
Craig Mautner
82da2ee927 am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 
* commit 'ef04ae79af58cc86c4312fac18c8a4eb24fc73ae':
  Complete booting when frontmost activity is idle
 2015-01-13 21:34:32 +00:00
Craig Mautner
0f6da477cb am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev 
* commit '31ae17309e8c79c4b1a7b63a9c4bb43ae0849de2':
  Add debug for ANR
 2015-01-13 21:34:27 +00:00
Craig Mautner
ef04ae79af Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 2015-01-13 21:28:37 +00:00
Craig Mautner
31ae17309e Merge "Add debug for ANR" into lmp-mr1-dev 2015-01-13 21:27:23 +00:00
Craig Mautner
bcb6eb9e26 Add debug for ANR 
Help for bug 17721767.

Change-Id: If863f3e6536be8af2c189dcc37d503c4d6b663b4
 2015-01-13 13:24:17 -08:00
Tyler Gunn
0e5b3d4eab am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev 
* commit 'a27523e3e0fd6c6cab18255151f2f9ec9a72f3d6':
  Fix for call timer resetting when starting IMS conference call. 1/4
 2015-01-13 20:47:18 +00:00
Tyler Gunn
a27523e3e0 Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev 2015-01-13 20:42:37 +00:00
Stuart Scott
4abdd07949 Update javadoc and hide getNameSource and getDataRoaming. 
Note SubscriptionInfo was not public in 21 and 22 hasn't been released yet.

bug:18983672
Change-Id: I9e8684eea2462fb655846d0719158d54007fabc5
 2015-01-13 12:31:04 -08:00
Eric Laurent
4fb3b60215 AudioService: handle stream mute by stream alias 
Handle stream mute/unmute requests at the stream
alias level (like is done volume changes) to be consistent.
E.g a request to mute/unmute a stream will affect all streams
sharing the same alias for volume management.

Bug: 18844550.
Change-Id: Ie2e463c58df0371589150f0ebb9b36c38b14e1be
 2015-01-13 12:19:53 -08:00
Craig Mautner
f3ea23ad9b Complete booting when frontmost activity is idle 
The boot process is intended to complete when the frontmost activity
becomes idle. This change fixes a corner case where the system was
booting and the Home activity became idle when it was not at the
front causing the system to never complete booting.

Before ag/603303 a secondary stack was created for the TaskPersister
at the beginning of activity manager systemReady(). Following that
change the secondary stack was created for the first time when a task
was restored from system ui recents when getTaskThumbnail() was
called. At the time it was created it was also moved to the front of
the stack order.

If that stack creation happens to occur after the Home activity is
started but before the Home activity becomes idle then the new stack
will obscure the Home activity and the boot process does not
complete.

1. This change adds a test for an idle activity coming to the front
when a stack is moving to the front and we haven't completed booting
yet. If this situation is detected the boot sequence is then
completed.

2. This change fixes the stack ordering so that creating a new task
when restoring recents does not automatically move the stack to the
front.

Fixes bug 18949470.

Change-Id: I243f0bb4396b518a0a8835c0c7bdccb2581a3520
 2015-01-13 11:27:30 -08:00
Wink Saville
6a903c31fe am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:48 +00:00
Fyodor Kupolov
c87d162815 Run isKeyguardSecure under system privileges 
In certain cases, isKeyguardSecure calls UserManager.getProfileParent, which
requires MANAGE_USERS permission.
Now the check is done under system privileges.

Bug:18765066
Change-Id: I6b23aedee06403d36523af5fee9c7db9659284b3
 2015-01-13 11:06:04 -08:00
Wink Saville
84c5e8ebf0 Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 2015-01-13 19:02:07 +00:00
Bryce Lee
e036ce2e70 am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 
* commit '9320e9f0a6af9269bc145ec7ab3d4b351f0614af':
  Update javadoc for DEFAULT_FEATURES deprecation.
 2015-01-13 19:01:24 +00:00
Adam Powell
57744dd139 am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 
* commit '69c22e82e9c3e95f4689a57320de3199ffd29262':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
 2015-01-13 19:01:19 +00:00
Bryce Lee
9320e9f0a6 Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev 2015-01-13 18:59:36 +00:00
Adam Powell
69c22e82e9 Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev 2015-01-13 18:57:33 +00:00
Winson Chung
b1a0a57cca Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 
automerge: 7ce662e  -s ours

* commit '7ce662ef870df34cd189b4ce9e487e496ba407dd':
  DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
 2015-01-13 18:19:39 +00:00
Winson Chung
7ce662ef87 Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 2015-01-13 18:16:22 +00:00
Nicolas Prévot
e5d3ee8e4f Merge "Clarify docs for user restrictions" into lmp-mr1-dev 
automerge: 6ab76bd

* commit '6ab76bd434d587fecefd5801905b09bcd32b1661':
  Clarify docs for user restrictions
 2015-01-13 17:39:34 +00:00
Nicolas Prévot
6ab76bd434 Merge "Clarify docs for user restrictions" into lmp-mr1-dev 2015-01-13 17:35:14 +00:00
Bryce Lee
aa1008cba4 Update javadoc for DEFAULT_FEATURES deprecation. 
Bug: 18983343
Change-Id: I10936e292edf9146e7acca231632fb704054215c
 2015-01-13 09:26:46 -08:00
Ricardo Cervera
cca3d44b70 am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
automerge: 8eb3060

* commit '8eb306077d603baae0d8e00a909f97275f83f3db':
  docs: Fix broken link in Common Intents
 2015-01-13 16:55:00 +00:00
Ricardo Cervera
8eb306077d am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a 
* commit '62ceea31564ac27c84ff78b400f844be98917c29':
  docs: Fix broken link in Common Intents
 2015-01-13 16:49:57 +00:00
Ricardo Cervera
62ceea3156 am f5569413: docs: Fix broken link in Common Intents 
automerge: c2d373a

* commit 'c2d373a0a7bb45e8c8a282781c5bc4f75db86b7d':
  docs: Fix broken link in Common Intents
 2015-01-13 16:42:22 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:24 -08:00
Ricardo Cervera
c2d373a0a7 am f5569413: docs: Fix broken link in Common Intents 
* commit 'f556941357ea391cae6dcd2e22b71a837a216d06':
  docs: Fix broken link in Common Intents
 2015-01-13 16:35:04 +00:00
Ricardo Cervera
f556941357 docs: Fix broken link in Common Intents 
Bug: 18991366

Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
 2015-01-13 08:28:22 -08:00
Narayan Kamath
c63a16b8e4 Fix unexpected language changes on SIM card insertion. 
There are two separate issues here that need to be fixed, both
boil down to the fact that adding an imperative (userSetLocale)
to the Configuration is a bad idea. Because of this:

- We'd never persist the first user set configuration if it was en_US,
  because of an erroneous call to Configuration.setLocale.

- ActivityManager.getConfiguration would sometimes return a
  Configuration with userSetLocale == true, which means callers with
  the right permissions would inadvertently persist a locale they didn't
  want to persist.

bug: 18879010

Change-Id: Id330ffde9d2a6e516fd60edc33f5529df719c634
 2015-01-13 16:27:17 +00:00
Amith Yamasani
150514bd03 Clarify docs for user restrictions 
Specify which restrictions are not relevant or behave differently
for managed profiles.

Bug: 18768578
Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2
 2015-01-13 16:04:42 +00:00
Alan Viverette
82bdfcfadc Update docs for Window.setElevation(), apply changes immediately 
automerge: 71922de

* commit '71922de6c8e407ff24bb1a500cb53bb1a647c758':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:16:32 +00:00
Winson Chung
98e8f7ac5e DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes. 
Fixes an issue where the screen pinning UI in the Overview space would
not appear on the first load after changing the setting, this was because
the updated flag was not read before the tasks were preloaded prior to
entering the Overview space.

Bug: 18986736
Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f
 2015-01-12 17:36:47 -08:00
Alan Viverette
71922de6c8 Update docs for Window.setElevation(), apply changes immediately 
BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
 2015-01-12 16:14:02 -08:00